[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.7,1.8 console.cpp,1.4,1.5 events.cpp,1.8,1.9 gfx.cpp,1.10,1.11 gfx.h,1.3,1.4 ihnm_introproc.cpp,1.5,1.6 interface.cpp,1.6,1.7 ite_introproc.cpp,1.7,1.8 module.mk,1.11,1.12 objectmap.cpp,1.6,1.7 palanim.cpp,1.5,1.6 reinherit.h,1.16,1.17 render.cpp,1.8,1.9 saga.cpp,1.18,1.19 sceneproc.cpp,1.5,1.6 sysgfx.cpp,1.8,NONE sysgfx.h,1.5,NONE
Eugene Sandulenko
sev at users.sourceforge.net
Sat May 1 17:02:00 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,NONE,1.1 timer.cpp,NONE,1.1 timer.h,NONE,1.1 module.mk,1.10,1.11 render.cpp,1.7,1.8 saga.cpp,1.17,1.18 sysinput.cpp,1.4,NONE systimer.cpp,1.5,NONE systimer.h,1.5,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga reinherit.h,1.17,1.18 sys_interface.h,1.5,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29719
Modified Files:
actor.cpp console.cpp events.cpp gfx.cpp gfx.h
ihnm_introproc.cpp interface.cpp ite_introproc.cpp module.mk
objectmap.cpp palanim.cpp reinherit.h render.cpp saga.cpp
sceneproc.cpp
Removed Files:
sysgfx.cpp sysgfx.h
Log Message:
Merged sysgfx.cpp and gfx.cpp to gfx.cpp
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- actor.cpp 1 May 2004 06:16:57 -0000 1.7
+++ actor.cpp 2 May 2004 00:00:37 -0000 1.8
@@ -221,7 +221,7 @@
R_SURFACE *back_buf;
- back_buf = SYSGFX_GetBackBuffer();
+ back_buf = GFX_GetBackBuffer();
for (walk_p = ys_dll_head(ActorModule.list); walk_p != NULL; walk_p = ys_dll_next(walk_p)) {
actor = (R_ACTOR *)ys_dll_get_data(walk_p);
Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/console.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- console.cpp 1 May 2004 06:35:06 -0000 1.4
+++ console.cpp 2 May 2004 00:00:38 -0000 1.5
@@ -216,9 +216,9 @@
fill_rect.bottom = ConInfo.y_pos;
fill_rect.right = ds->buf_w - 1;
- GFX_DrawRect(ds, &fill_rect, SYSGFX_MatchColor(R_CONSOLE_BGCOLOR));
- txt_fgcolor = SYSGFX_MatchColor(R_CONSOLE_TXTCOLOR);
- txt_shcolor = SYSGFX_MatchColor(R_CONSOLE_TXTSHADOW);
+ GFX_DrawRect(ds, &fill_rect, GFX_MatchColor(R_CONSOLE_BGCOLOR));
+ txt_fgcolor = GFX_MatchColor(R_CONSOLE_TXTCOLOR);
+ txt_shcolor = GFX_MatchColor(R_CONSOLE_TXTSHADOW);
FONT_Draw(SMALL_FONT_ID, ds, ">", 1, 2, ConInfo.y_pos - 10, txt_fgcolor, txt_shcolor, FONT_SHADOW);
FONT_Draw(SMALL_FONT_ID, ds, ConInfo.input_buf, strlen(ConInfo.input_buf),
@@ -354,7 +354,7 @@
percent = 1.0;
}
- back_buf = SYSGFX_GetBackBuffer();
+ back_buf = GFX_GetBackBuffer();
CON_SetDropPos(percent);
CON_Draw(back_buf);
@@ -369,7 +369,7 @@
ConInfo.active = 0;
}
- back_buf = SYSGFX_GetBackBuffer();
+ back_buf = GFX_GetBackBuffer();
CON_SetDropPos(1.0 - percent);
CON_Draw(back_buf);
Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- events.cpp 1 May 2004 06:50:20 -0000 1.8
+++ events.cpp 2 May 2004 00:00:38 -0000 1.9
@@ -159,13 +159,13 @@
case R_PAL_EVENT:
switch (event->op) {
case EVENT_BLACKTOPAL:
- back_buf = SYSGFX_GetBackBuffer();
- SYSGFX_BlackToPal(back_buf, (PALENTRY *)event->data, event_pc);
+ back_buf = GFX_GetBackBuffer();
+ GFX_BlackToPal(back_buf, (PALENTRY *)event->data, event_pc);
break;
case EVENT_PALTOBLACK:
- back_buf = SYSGFX_GetBackBuffer();
- SYSGFX_PalToBlack(back_buf, (PALENTRY *)event->data, event_pc);
+ back_buf = GFX_GetBackBuffer();
+ GFX_PalToBlack(back_buf, (PALENTRY *)event->data, event_pc);
break;
default:
break;
@@ -249,7 +249,7 @@
if (SCENE_GetMode() == R_SCENE_MODE_NORMAL) {
- back_buf = SYSGFX_GetBackBuffer();
+ back_buf = GFX_GetBackBuffer();
RENDER_GetBufferInfo(&rbuf_info);
SCENE_GetBGInfo(&bginfo);
@@ -262,7 +262,7 @@
if (event->param == SET_PALETTE) {
PALENTRY *pal_p;
SCENE_GetBGPal(&pal_p);
- SYSGFX_SetPalette(back_buf, pal_p);
+ GFX_SetPalette(back_buf, pal_p);
}
}
}
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gfx.cpp 1 May 2004 23:42:22 -0000 1.10
+++ gfx.cpp 2 May 2004 00:00:38 -0000 1.11
@@ -37,6 +37,42 @@
namespace Saga {
+static R_GFX_MODULE GfxModule;
+static OSystem *_system;
+
+static byte cur_pal[R_PAL_ENTRIES * 4];
+
+int GFX_Init(OSystem *system, int width, int height) {
+ R_SURFACE r_back_buf;
+
+ _system = system;
+ _system->initSize(width, height);
+
+ debug(0, "Init screen %dx%d", width, height);
+ // Convert sdl surface data to R surface data
+ r_back_buf.buf = (byte *)calloc(1, width * height);
+ r_back_buf.buf_w = width;
+ r_back_buf.buf_h = height;
+ r_back_buf.buf_pitch = width;
+
+ r_back_buf.clip_rect.left = 0;
+ r_back_buf.clip_rect.top = 0;
+ r_back_buf.clip_rect.right = width - 1;
+ r_back_buf.clip_rect.bottom = height - 1;
+
+ // Set module data
+ GfxModule.r_back_buf = r_back_buf;
+ GfxModule.init = 1;
+
+ return R_SUCCESS;
+}
+
+/*
+~Gfx() {
+ free(GfxModule.r_back_buf->buf);
+}
+ */
+
int GFX_DrawPalette(R_SURFACE *dst_s) {
int x;
int y;
@@ -843,4 +879,232 @@
return;
}
+R_SURFACE *GFX_GetBackBuffer() {
+ return &GfxModule.r_back_buf;
+}
+
+int GFX_GetWhite(void) {
+ return GfxModule.white_index;
+}
+
+int GFX_GetBlack(void) {
+ return GfxModule.black_index;
+}
+
+int GFX_MatchColor(unsigned long colormask) {
+ int i;
+ int red = (colormask & 0x0FF0000UL) >> 16;
+ int green = (colormask & 0x000FF00UL) >> 8;
+ int blue = colormask & 0x00000FFUL;
+ int dr;
+ int dg;
+ int db;
+ long color_delta;
+ long best_delta = LONG_MAX;
+ int best_index = 0;
+ byte *ppal;
+
+ for (i = 0, ppal = cur_pal; i < R_PAL_ENTRIES; i++, ppal += 4) {
+ dr = ppal[0] - red;
+ dr = ABS(dr);
+ dg = ppal[1] - green;
+ dg = ABS(dg);
+ db = ppal[2] - blue;
+ db = ABS(db);
+ ppal[3] = 0;
+
+ color_delta = (long)(dr * R_RED_WEIGHT + dg * R_GREEN_WEIGHT + db * R_BLUE_WEIGHT);
+
+ if (color_delta == 0) {
+ return i;
+ }
+
+ if (color_delta < best_delta) {
+ best_delta = color_delta;
+ best_index = i;
+ }
+ }
+
+ return best_index;
+}
+
+int GFX_SetPalette(R_SURFACE *surface, PALENTRY *pal) {
+ byte red;
+ byte green;
+ byte blue;
+ int color_delta;
+ int best_wdelta = 0;
+ int best_windex = 0;
+ int best_bindex = 0;
+ int best_bdelta = 1000;
+ int i;
+ byte *ppal;
+
+ for (i = 0, ppal = cur_pal; i < R_PAL_ENTRIES; i++, ppal += 4) {
+ red = pal[i].red;
+ ppal[0] = red;
+ color_delta = red;
+ green = pal[i].green;
+ ppal[1] = green;
+ color_delta += green;
+ blue = pal[i].blue;
+ ppal[2] = blue;
+ color_delta += blue;
+ ppal[3] = 0;
+
+ if (color_delta < best_bdelta) {
+ best_bindex = i;
+ best_bdelta = color_delta;
+ }
+
+ if (color_delta > best_wdelta) {
+ best_windex = i;
+ best_wdelta = color_delta;
+ }
+ }
+
+ // Set whitest and blackest color indices
+ GfxModule.white_index = best_windex;
+ GfxModule.black_index = best_bindex;
+
+ _system->setPalette(cur_pal, 0, R_PAL_ENTRIES);
+
+ return R_SUCCESS;
+}
+
+int GFX_GetCurrentPal(PALENTRY *src_pal) {
+ int i;
+ byte *ppal;
+
+ for (i = 0, ppal = cur_pal; i < R_PAL_ENTRIES; i++, ppal += 4) {
+ src_pal[i].red = ppal[0];
+ src_pal[i].green = ppal[1];
+ src_pal[i].blue = ppal[2];
+ }
+
+ return R_SUCCESS;
+}
+
+int GFX_PalToBlack(R_SURFACE *surface, PALENTRY *src_pal, double percent) {
+ int i;
+ //int fade_max = 255;
+ int new_entry;
+ byte *ppal;
+
+ double fpercent;
+
+ if (percent > 1.0) {
+ percent = 1.0;
+ }
+
+ // Exponential fade
+ fpercent = percent * percent;
+
+ fpercent = 1.0 - fpercent;
+
+ // Use the correct percentage change per frame for each palette entry
+ for (i = 0, ppal = cur_pal; i < R_PAL_ENTRIES; i++, ppal += 4) {
+ new_entry = (int)(src_pal[i].red * fpercent);
+
+ if (new_entry < 0) {
+ ppal[0] = 0;
+ } else {
+ ppal[0] = (byte) new_entry;
+ }
+
+ new_entry = (int)(src_pal[i].green * fpercent);
+
+ if (new_entry < 0) {
+ ppal[1] = 0;
+ } else {
+ ppal[1] = (byte) new_entry;
+ }
+
+ new_entry = (int)(src_pal[i].blue * fpercent);
+
+ if (new_entry < 0) {
+ ppal[2] = 0;
+ } else {
+ ppal[2] = (byte) new_entry;
+ }
+ ppal[3] = 0;
+ }
+
+ _system->setPalette(cur_pal, 0, R_PAL_ENTRIES);
+
+ return R_SUCCESS;
+}
+
+int GFX_BlackToPal(R_SURFACE *surface, PALENTRY *src_pal, double percent) {
+ int new_entry;
+ double fpercent;
+ int color_delta;
+ int best_wdelta = 0;
+ int best_windex = 0;
+ int best_bindex = 0;
+ int best_bdelta = 1000;
+ byte *ppal;
+ int i;
+
+ if (percent > 1.0) {
+ percent = 1.0;
+ }
+
+ // Exponential fade
+ fpercent = percent * percent;
+
+ fpercent = 1.0 - fpercent;
+
+ // Use the correct percentage change per frame for each palette entry
+ for (i = 0, ppal = cur_pal; i < R_PAL_ENTRIES; i++, ppal += 4) {
+ new_entry = (int)(src_pal[i].red - src_pal[i].red * fpercent);
+
+ if (new_entry < 0) {
+ ppal[0] = 0;
+ } else {
+ ppal[0] = (byte) new_entry;
+ }
+
+ new_entry = (int)(src_pal[i].green - src_pal[i].green * fpercent);
+
+ if (new_entry < 0) {
+ ppal[1] = 0;
+ } else {
+ ppal[1] = (byte) new_entry;
+ }
+
+ new_entry = (int)(src_pal[i].blue - src_pal[i].blue * fpercent);
+
+ if (new_entry < 0) {
+ ppal[2] = 0;
+ } else {
+ ppal[2] = (byte) new_entry;
+ }
+ ppal[3] = 0;
+ }
+
+ // Find the best white and black color indices again
+ if (percent >= 1.0) {
+ for (i = 0, ppal = cur_pal; i < R_PAL_ENTRIES; i++, ppal += 4) {
+ color_delta = ppal[0];
+ color_delta += ppal[1];
+ color_delta += ppal[2];
+
+ if (color_delta < best_bdelta) {
+ best_bindex = i;
+ best_bdelta = color_delta;
+ }
+
+ if (color_delta > best_wdelta) {
+ best_windex = i;
+ best_wdelta = color_delta;
+ }
+ }
+ }
+
+ _system->setPalette(cur_pal, 0, R_PAL_ENTRIES);
+
+ return R_SUCCESS;
+}
+
} // End of namespace Saga
Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gfx.h 1 May 2004 07:32:48 -0000 1.3
+++ gfx.h 2 May 2004 00:00:38 -0000 1.4
@@ -34,6 +34,19 @@
#define R_CURSOR_ORIGIN_X 4
#define R_CURSOR_ORIGIN_Y 4
+#define R_RED_WEIGHT 0.299
+#define R_GREEN_WEIGHT 0.587
+#define R_BLUE_WEIGHT 0.114
+
+struct R_GFX_MODULE {
+ int init;
+
+ R_SURFACE r_back_buf;
+
+ int white_index;
+ int black_index;
+};
+
} // End of namespace Saga
#endif
Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ihnm_introproc.cpp 1 May 2004 19:41:47 -0000 1.5
+++ ihnm_introproc.cpp 2 May 2004 00:00:38 -0000 1.6
@@ -142,7 +142,7 @@
case SCENE_BEGIN:
// Fade to black out of the intro CyberDreams logo anim
- SYSGFX_GetCurrentPal(current_pal);
+ GFX_GetCurrentPal(current_pal);
event.type = R_CONTINUOUS_EVENT;
event.code = R_PAL_EVENT;
@@ -203,7 +203,7 @@
switch (param) {
case SCENE_BEGIN:
// Fade to black out of the intro DG logo anim
- SYSGFX_GetCurrentPal(current_pal);
+ GFX_GetCurrentPal(current_pal);
event.type = R_CONTINUOUS_EVENT;
event.code = R_PAL_EVENT;
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- interface.cpp 1 May 2004 23:42:22 -0000 1.6
+++ interface.cpp 2 May 2004 00:00:38 -0000 1.7
@@ -254,7 +254,7 @@
R_RECT rect;
R_POINT origin;
- back_buf = SYSGFX_GetBackBuffer();
+ back_buf = GFX_GetBackBuffer();
if (!IfModule.active) {
return R_SUCCESS;
@@ -318,7 +318,7 @@
imouse_x = imouse_pt->x;
imouse_y = imouse_pt->y;
- back_buf = SYSGFX_GetBackBuffer();
+ back_buf = GFX_GetBackBuffer();
// Get game display info
GAME_GetDisplayInfo(&g_di);
Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ite_introproc.cpp 1 May 2004 13:04:31 -0000 1.7
+++ ite_introproc.cpp 2 May 2004 00:00:39 -0000 1.8
@@ -242,7 +242,7 @@
switch (param) {
case SCENE_BEGIN:
// Fade to black out of the intro DG/NWC logo animation
- SYSGFX_GetCurrentPal(current_pal);
+ GFX_GetCurrentPal(current_pal);
event.type = R_CONTINUOUS_EVENT;
event.code = R_PAL_EVENT;
event.op = EVENT_PALTOBLACK;
Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/module.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- module.mk 1 May 2004 23:46:23 -0000 1.11
+++ module.mk 2 May 2004 00:00:39 -0000 1.12
@@ -38,7 +38,6 @@
saga/ys_binread.o \
saga/ys_binwrite.o \
saga/ys_dl_list.o \
- saga/sysgfx.o \
saga/input.o \
saga/timer.o \
saga/music.o \
Index: objectmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/objectmap.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- objectmap.cpp 1 May 2004 13:04:31 -0000 1.6
+++ objectmap.cpp 2 May 2004 00:00:39 -0000 1.7
@@ -365,7 +365,7 @@
}
if (draw_txt) {
- FONT_Draw(SMALL_FONT_ID, ds, txt_buf, 0, 2, 2, SYSGFX_GetWhite(), SYSGFX_GetBlack(), FONT_OUTLINE);
+ FONT_Draw(SMALL_FONT_ID, ds, txt_buf, 0, 2, 2, GFX_GetWhite(), GFX_GetBlack(), FONT_OUTLINE);
}
return R_SUCCESS;
Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/palanim.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- palanim.cpp 1 May 2004 23:42:22 -0000 1.5
+++ palanim.cpp 2 May 2004 00:00:39 -0000 1.6
@@ -153,8 +153,8 @@
return R_FAILURE;
}
- SYSGFX_GetCurrentPal(pal);
- back_buf = SYSGFX_GetBackBuffer();
+ GFX_GetCurrentPal(pal);
+ back_buf = GFX_GetBackBuffer();
for (i = 0; i < PAnimData.entry_count; i++) {
cycle = PAnimData.entries[i].cycle;
@@ -174,7 +174,7 @@
}
}
- SYSGFX_SetPalette(back_buf, pal);
+ GFX_SetPalette(back_buf, pal);
event.type = R_ONESHOT_EVENT;
event.code = R_PALANIM_EVENT;
Index: reinherit.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/reinherit.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- reinherit.h 1 May 2004 23:42:22 -0000 1.16
+++ reinherit.h 2 May 2004 00:00:39 -0000 1.17
@@ -109,18 +109,16 @@
// System : Graphics
#define R_PAL_ENTRIES 256
-int SYSGFX_Init(OSystem *system, int width, int height);
-R_SURFACE *SYSGFX_GetScreenSurface();
-R_SURFACE *SYSGFX_GetBackBuffer();
-int SYSGFX_LockSurface(R_SURFACE *surface);
-int SYSGFX_UnlockSurface(R_SURFACE *surface);
-int SYSGFX_GetWhite();
-int SYSGFX_GetBlack();
-int SYSGFX_MatchColor(unsigned long colormask);
-int SYSGFX_SetPalette(R_SURFACE *surface, PALENTRY *pal);
-int SYSGFX_GetCurrentPal(PALENTRY *src_pal);
-int SYSGFX_PalToBlack(R_SURFACE *surface, PALENTRY *src_pal, double percent);
-int SYSGFX_BlackToPal(R_SURFACE *surface, PALENTRY *src_pal, double percent);
+int GFX_Init(OSystem *system, int width, int height);
+R_SURFACE *GFX_GetScreenSurface();
+R_SURFACE *GFX_GetBackBuffer();
+int GFX_GetWhite();
+int GFX_GetBlack();
+int GFX_MatchColor(unsigned long colormask);
+int GFX_SetPalette(R_SURFACE *surface, PALENTRY *pal);
+int GFX_GetCurrentPal(PALENTRY *src_pal);
+int GFX_PalToBlack(R_SURFACE *surface, PALENTRY *src_pal, double percent);
+int GFX_BlackToPal(R_SURFACE *surface, PALENTRY *src_pal, double percent);
// System : Input
int SYSINPUT_Init();
@@ -129,9 +127,6 @@
int SYSINPUT_HideMouse(void);
int SYSINPUT_ShowMouse(void);
-// sys_signal.c
-int ITESYS_CheckSignal(void);
-
} // End of namespace Saga
#endif
Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- render.cpp 1 May 2004 23:46:23 -0000 1.8
+++ render.cpp 2 May 2004 00:00:39 -0000 1.9
@@ -72,7 +72,7 @@
// Initialize system graphics
GAME_GetDisplayInfo(&disp_info);
- if (SYSGFX_Init(system, disp_info.logical_w, disp_info.logical_h) != R_SUCCESS) {
+ if (GFX_Init(system, disp_info.logical_w, disp_info.logical_h) != R_SUCCESS) {
return R_FAILURE;
}
@@ -107,7 +107,7 @@
RenderModule.r_tmp_buf_w = tmp_w;
RenderModule.r_tmp_buf_h = tmp_h;
- RenderModule.r_backbuf_surface = SYSGFX_GetBackBuffer();
+ RenderModule.r_backbuf_surface = GFX_GetBackBuffer();
// Initialize cursor state
if (RenderModule.r_softcursor) {
@@ -155,8 +155,8 @@
// Display scene maps, if applicable
if (RENDER_GetFlags() & RF_OBJECTMAP_TEST) {
- OBJECTMAP_Draw(backbuf_surface, &mouse_pt, SYSGFX_GetWhite(), SYSGFX_GetBlack());
- ACTIONMAP_Draw(backbuf_surface, SYSGFX_MatchColor(R_RGB_RED));
+ OBJECTMAP_Draw(backbuf_surface, &mouse_pt, GFX_GetWhite(), GFX_GetBlack());
+ ACTIONMAP_Draw(backbuf_surface, GFX_MatchColor(R_RGB_RED));
}
// Draw queued actors
@@ -175,7 +175,7 @@
sprintf(txt_buf, "%d", RenderModule.r_fps);
fps_width = FONT_GetStringWidth(SMALL_FONT_ID, txt_buf, 0, FONT_NORMAL);
FONT_Draw(SMALL_FONT_ID, backbuf_surface, txt_buf, 0, backbuf_surface->buf_w - fps_width, 2,
- SYSGFX_GetWhite(), SYSGFX_GetBlack(), FONT_OUTLINE);
+ GFX_GetWhite(), GFX_GetBlack(), FONT_OUTLINE);
}
// Display "paused game" message, if applicable
@@ -183,7 +183,7 @@
int msg_len = strlen(R_PAUSEGAME_MSG);
int msg_w = FONT_GetStringWidth(BIG_FONT_ID, R_PAUSEGAME_MSG, msg_len, FONT_OUTLINE);
FONT_Draw(BIG_FONT_ID, backbuf_surface, R_PAUSEGAME_MSG, msg_len,
- (backbuf_surface->buf_w - msg_w) / 2, 90, SYSGFX_GetWhite(), SYSGFX_GetBlack(), FONT_OUTLINE);
+ (backbuf_surface->buf_w - msg_w) / 2, 90, GFX_GetWhite(), GFX_GetBlack(), FONT_OUTLINE);
}
// Update user interface
@@ -197,7 +197,7 @@
// Display text formatting test, if applicable
if (RenderModule.r_flags & RF_TEXT_TEST) {
TEXT_Draw(MEDIUM_FONT_ID, backbuf_surface, test_txt, mouse_pt.x, mouse_pt.y,
- SYSGFX_GetWhite(), SYSGFX_GetBlack(), FONT_OUTLINE | FONT_CENTERED);
+ GFX_GetWhite(), GFX_GetBlack(), FONT_OUTLINE | FONT_CENTERED);
}
// Display palette test, if applicable
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- saga.cpp 1 May 2004 23:46:23 -0000 1.18
+++ saga.cpp 2 May 2004 00:00:39 -0000 1.19
@@ -215,11 +215,6 @@
SCENE_Start();
for (;;) {
-#ifdef R_USE_CUSTOM_WININIT
- if (ITESYS_CheckSignal()) {
- break;
- }
-#endif
if (RENDER_GetFlags() & RF_RENDERPAUSE) {
// Freeze time while paused
SYSTIMER_ResetMSCounter();
Index: sceneproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sceneproc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sceneproc.cpp 1 May 2004 14:05:10 -0000 1.5
+++ sceneproc.cpp 2 May 2004 00:00:39 -0000 1.6
@@ -55,7 +55,7 @@
_vm->_sound->stopVoice();
// Fade palette to black from intro scene
- SYSGFX_GetCurrentPal(current_pal);
+ GFX_GetCurrentPal(current_pal);
event.type = R_CONTINUOUS_EVENT;
event.code = R_PAL_EVENT;
--- sysgfx.cpp DELETED ---
--- sysgfx.h DELETED ---
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,NONE,1.1 timer.cpp,NONE,1.1 timer.h,NONE,1.1 module.mk,1.10,1.11 render.cpp,1.7,1.8 saga.cpp,1.17,1.18 sysinput.cpp,1.4,NONE systimer.cpp,1.5,NONE systimer.h,1.5,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga reinherit.h,1.17,1.18 sys_interface.h,1.5,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list