Wrapped some more oldgui-specific code around INCLUDE_OLDGFX safeguards

svn-id: r45492

3 files changed, 8 insertions, 11 deletions

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 54f1e3c185..4789707ecf 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -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;
 }
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 3e5abe7015..e362a14e6b 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -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));
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index cb02e13614..638342131c 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -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 */