libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-16 23:19:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Wrapped some more oldgui-specific code around INCLUDE_OLDGFX safeguards

Browse Source 
svn-id: r45492
This commit is contained in:
Filippos Karapetis 2009-10-28 22:01:42 +00:00
parent d62342b32b
commit 21323a8d12
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/sci/engine/game.cpp
View File

@ -323,7 +323,6 @@ int script_init_engine(EngineState *s) {
str->_maxSize = MAX_SAVE_DIR_SIZE;
str->_value = (char *)calloc(MAX_SAVE_DIR_SIZE, sizeof(char));
s->r_acc = s->r_prev = NULL_REG;
s->restAdjust = 0;
@ -342,7 +341,9 @@ int script_init_engine(EngineState *s) {
debug(2, "Engine initialized");
#ifdef INCLUDE_OLDGFX
s->pic_priority_table = NULL;
#endif
return 0;
}

8
engines/sci/engine/state.cpp
View File

@ -43,15 +43,13 @@ EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc,
restarting_flags = 0;
pic_not_valid = 0;
pic_is_new = 0;
pic_priority_table = 0;
status_bar_foreground = 0;
status_bar_background = 0;
#ifdef INCLUDE_OLDGFX
pic_priority_table = 0;
pic_not_valid = 0;
pic_is_new = 0;
old_screen = 0;
port = 0;
memset(ega_colors, 0, sizeof(ega_colors));

8
engines/sci/engine/state.h
View File

@ -142,17 +142,15 @@ public:
byte restarting_flags; /**< Flags used for restarting */
byte pic_not_valid; /**< Is 0 if the background picture is "valid" */
byte pic_is_new; /**< New pic was loaded or port was opened */
int *pic_priority_table; /**< 16 entries with priorities or NULL if not present */
/** Text on the status bar, or NULL if the title bar is blank */
Common::String _statusBarText;
int status_bar_foreground, status_bar_background;
#ifdef INCLUDE_OLDGFX
int *pic_priority_table; /**< 16 entries with priorities or NULL if not present */
byte pic_not_valid; /**< Is 0 if the background picture is "valid" */
byte pic_is_new; /**< New pic was loaded or port was opened */
gfx_pixmap_t *old_screen; /**< Old screen content: Stored during kDrawPic() for kAnimate() */
GfxPort *port; /**< The currently active port */