[Scummvm-cvs-logs] SF.net SVN: scummvm:[45492] scummvm/trunk/engines/sci/engine

[thebluegr at users.sourceforge.net]

Revision: 45492
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45492&view=rev
Author:   thebluegr
Date:     2009-10-28 22:01:42 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Wrapped some more oldgui-specific code around INCLUDE_OLDGFX safeguards

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.cpp
    scummvm/trunk/engines/sci/engine/state.cpp
    scummvm/trunk/engines/sci/engine/state.h

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2009-10-28 21:57:19 UTC (rev 45491)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2009-10-28 22:01:42 UTC (rev 45492)
@@ -323,7 +323,6 @@
 	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 @@
 
 	debug(2, "Engine initialized");
 
+#ifdef INCLUDE_OLDGFX
 	s->pic_priority_table = NULL;
+#endif
 
 	return 0;
 }

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2009-10-28 21:57:19 UTC (rev 45491)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2009-10-28 22:01:42 UTC (rev 45492)
@@ -43,15 +43,13 @@
 
 	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));

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2009-10-28 21:57:19 UTC (rev 45491)
+++ scummvm/trunk/engines/sci/engine/state.h	2009-10-28 22:01:42 UTC (rev 45492)
@@ -142,17 +142,15 @@
 
 	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 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.