[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freesci-develop] r1529 - in freesci/branches/glutton: . src src/gfx
From: |
freesci |
Subject: |
[freesci-develop] r1529 - in freesci/branches/glutton: . src src/gfx |
Date: |
Sun, 12 Feb 2006 02:36:02 +0100 |
Author: jameson
Date: 2006-02-12 02:35:58 +0100 (Sun, 12 Feb 2006)
New Revision: 1529
Modified:
freesci/branches/glutton/ChangeLog
freesci/branches/glutton/configure.in
freesci/branches/glutton/freesci.spec
freesci/branches/glutton/src/gfx/gfx_test.c
freesci/branches/glutton/src/main.c
Log:
* Fixed gfx_test
* Fixed MVI detection on Alpha
-- Christoph
Modified: freesci/branches/glutton/ChangeLog
===================================================================
--- freesci/branches/glutton/ChangeLog 2006-02-12 01:09:14 UTC (rev 1528)
+++ freesci/branches/glutton/ChangeLog 2006-02-12 01:35:58 UTC (rev 1529)
@@ -1,3 +1,11 @@
+2006-02-11 Christoph Reichenbach <address@hidden>
+
+ * src/engine/kgraphics.c (_find_view_priority): Fixed 14 priority
+ zone comparisons according to Hugues' recipe
+
+ * src/include/games.h: Forward-"ported" Hugues' list of new game
+ IDs
+
2006-02-01 Christoph Reichenbach <address@hidden>
* src/engine/kgraphics.c (_find_priority_band): Treat
Modified: freesci/branches/glutton/configure.in
===================================================================
--- freesci/branches/glutton/configure.in 2006-02-12 01:09:14 UTC (rev
1528)
+++ freesci/branches/glutton/configure.in 2006-02-12 01:35:58 UTC (rev
1529)
@@ -4,7 +4,7 @@
AC_CANONICAL_TARGET([])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(freesci, 0.6.1-devel)
+AM_INIT_AUTOMAKE(freesci, 0.6.2-pre0)
AC_PROG_CC
#AC_LIBTOOL_DLOPEN
@@ -185,6 +185,7 @@
fi
AC_CHECK_LIB(Xi, XGrabDevice, [X_LIBS="$X_LIBS -lXi"])
AC_CHECK_LIB(X11, XOpenDisplay, [X_LIBS="$X_LIBS -lX11"])
+ AC_CHECK_LIB(Xext, XShmAttach, [X_LIBS="$X_LIBS -lXext"])
fsci_xlib_driver="yes"
fi
Modified: freesci/branches/glutton/freesci.spec
===================================================================
--- freesci/branches/glutton/freesci.spec 2006-02-12 01:09:14 UTC (rev
1528)
+++ freesci/branches/glutton/freesci.spec 2006-02-12 01:35:58 UTC (rev
1529)
@@ -1,6 +1,6 @@
Summary: A portable interpreter for SCI games
Name: freesci
-Version: 0.6.1_devel
+Version: 0.6.2_pre0
Release: 1
Group: Games/Adventure
Copyright: GPL
Modified: freesci/branches/glutton/src/gfx/gfx_test.c
===================================================================
--- freesci/branches/glutton/src/gfx/gfx_test.c 2006-02-12 01:09:14 UTC (rev
1528)
+++ freesci/branches/glutton/src/gfx/gfx_test.c 2006-02-12 01:35:58 UTC (rev
1529)
@@ -56,7 +56,7 @@
}
int
-sciprintf(char *fmt, ...)
+sciprintf(const char *fmt, ...)
{
va_list argp;
va_start(argp, fmt);
@@ -716,9 +716,9 @@
#define TEST_LINE(x, y, xl, yl) \
- gfxop_draw_line(state, gfx_rect(x, y, xl, yl), blue,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL); \
+ gfxop_draw_line(state, gfx_point(x, y), gfx_point((x)+(xl), (y)+(yl)),
blue, GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL); \
gfxop_set_clip_zone(state, gfx_rect(140, 60, 40, 40)); \
- gfxop_draw_line(state, gfx_rect(x, y, xl, yl), red, GFX_LINE_MODE_FAST,
GFX_LINE_STYLE_NORMAL); \
+ gfxop_draw_line(state, gfx_point(x, y), gfx_point((x)+(xl), (y)+(yl)),
red, GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL); \
gfxop_set_clip_zone(state, gfx_rect(0, 0, 320, 200));
#define LINES_NR 19
@@ -755,20 +755,20 @@
MESSAGE("Some tests will include 'fine' lines.\nNote that support for
those is\noptional.");
waitkey();
- gfxop_draw_line(state, gfx_rect(30, 30, 260, 0), red,
GFX_LINE_MODE_FINE, GFX_LINE_STYLE_NORMAL);
- gfxop_draw_line(state, gfx_rect(30, 40, 260, 0), blue,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
- gfxop_draw_line(state, gfx_rect(30, 50, 260, 0), green,
GFX_LINE_MODE_FINE, GFX_LINE_STYLE_STIPPLED);
- gfxop_draw_line(state, gfx_rect(30, 60, 260, 0), white,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_STIPPLED);
+ gfxop_draw_line(state, gfx_point(30, 30), gfx_point(290, 30), red,
GFX_LINE_MODE_FINE, GFX_LINE_STYLE_NORMAL);
+ gfxop_draw_line(state, gfx_point(30, 40), gfx_point(290, 40), blue,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
+ gfxop_draw_line(state, gfx_point(30, 50), gfx_point(290, 50), green,
GFX_LINE_MODE_FINE, GFX_LINE_STYLE_STIPPLED);
+ gfxop_draw_line(state, gfx_point(30, 60), gfx_point(290, 60), white,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_STIPPLED);
update();
MESSAGE("B.0: horizontal lines:\nYou should now be seeing
(top-down):\nred-fine, blue-normal,\ngreen-fine-stippled, white-stippled");
waitkey();
clear();
- gfxop_draw_line(state, gfx_rect(30, 30, 260, 100), blue,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
- gfxop_draw_line(state, gfx_rect(30, 130, 260, -100), blue,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
+ gfxop_draw_line(state, gfx_point(30, 30), gfx_point(290, 130), blue,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
+ gfxop_draw_line(state, gfx_point(30, 130), gfx_point(290, 30), blue,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
gfxop_set_clip_zone(state, gfx_rect(140, 60, 40, 40));
- gfxop_draw_line(state, gfx_rect(30, 30, 260, 100), red,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
- gfxop_draw_line(state, gfx_rect(30, 130, 260, -100), red,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
+ gfxop_draw_line(state, gfx_point(30, 30), gfx_point(290, 130), red,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
+ gfxop_draw_line(state, gfx_point(30, 130), gfx_point(290, 30), red,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
gfxop_set_clip_zone(state, gfx_rect(0, 0, 320, 200));
update();
MESSAGE("B.1: line clipping:\nTwo identical pairs of lines.\nblue lines
are unclipped,\nred ones are clipped.");
@@ -891,10 +891,11 @@
} else if (event.type == SCI_EVT_MOUSE_RELEASE)
if (pressed) {
+ point_t line_pt = gfx_point(line.x, line.y);
pressed = 0;
line.xl = state->pointer_pos.x - line.x;
line.yl = state->pointer_pos.y - line.y;
- gfxop_draw_line(state, line, red,
GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
+ gfxop_draw_line(state, state->pointer_pos,
line_pt, red, GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL);
if (line.xl < 0) {
line.x += line.xl;
Modified: freesci/branches/glutton/src/main.c
===================================================================
--- freesci/branches/glutton/src/main.c 2006-02-12 01:09:14 UTC (rev 1528)
+++ freesci/branches/glutton/src/main.c 2006-02-12 01:35:58 UTC (rev 1529)
@@ -109,7 +109,7 @@
helper = 0x100;
#ifdef __DECC
- helper = asm("amask %0, %v0", helper);
+ axp_have_mvi = asm("amask %0, %v0", helper);
#else
__asm__ ("amask %1, %0"
: "=r"(axp_have_mvi)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freesci-develop] r1529 - in freesci/branches/glutton: . src src/gfx,
freesci <=