Remove unused includes when INCLUDE_OLDGFX is not set. Implemented the full screen updates that the current menu code is doing using new graphics functions (still unfinished). Some cleanup.

svn-id: r45536

7 files changed, 18 insertions, 5 deletions

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 431611687c..d782ddb22d 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -34,9 +34,11 @@
 #include "sci/engine/state.h"
 #include "sci/engine/gc.h"
 #include "sci/engine/kernel_types.h"	// for determine_reg_type
+#ifdef INCLUDE_OLDGFX
 #include "sci/gfx/gfx_gui.h"	// for sciw_set_status_bar
 #include "sci/gfx/gfx_state_internal.h"
 #include "sci/gfx/gfx_widgets.h"	// for getPort
+#endif
 #include "sci/sfx/songlib.h"	// for SongLibrary
 #include "sci/sfx/iterator.h"	// for SCI_SONG_ITERATOR_TYPE_SCI0
 #include "sci/sfx/sci_midi.h"
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 4789707ecf..d6b9af8a90 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -33,7 +33,9 @@
 #include "sci/engine/kernel_types.h"
 #include "sci/gui/gui.h"
 #include "sci/engine/message.h"
+#ifdef INCLUDE_OLDGFX
 #include "sci/gfx/gfx_state_internal.h"	// required for GfxPort, GfxVisual
+#endif
 #include "sci/gfx/menubar.h"
 
 namespace Sci {
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index 1560bb1be7..f7f01d9a6e 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -27,8 +27,6 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 #include "sci/gfx/operations.h"
-#include "sci/gfx/gfx_widgets.h"
-#include "sci/gfx/gfx_state_internal.h"	// required for GfxPort, GfxVisual
 #include "sci/console.h"
 #include "sci/debug.h"	// for g_debug_simulated_key
 #include "sci/gui/gui.h"
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 9e8958289e..6358bc4143 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -27,9 +27,11 @@
 #include "sci/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
+#ifdef INCLUDE_OLDGFX
 #include "sci/gfx/gfx_gui.h"
-#include "sci/gfx/menubar.h"
 #include "sci/gfx/gfx_state_internal.h"	// required for GfxPort, GfxVisual
+#endif
+#include "sci/gfx/menubar.h"
 #include "sci/gui/gui.h"
 #include "sci/gui/gui_cursor.h"
 
@@ -112,12 +114,14 @@ static int _menu_go_down(Menubar *menubar, int menu_nr, int item_nr) {
 		return item_nr;
 }
 
+// TODO/FIXME: avoid full screen updates
 #ifdef INCLUDE_OLDGFX
 #define FULL_REDRAW \
 	s->visual->draw(Common::Point(0, 0)); \
 	gfxop_update(s->gfx_state);
 #else
-#define FULL_REDRAW
+#define FULL_REDRAW \
+	s->_gui->graphRedrawBox(Common::Rect(0, 0, 319, 219));
 #endif
 
 reg_t kMenuSelect(EngineState *s, int argc, reg_t *argv) {
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index 95facc75b0..3d92f180a4 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -25,7 +25,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-//#include "sci/sfx/player.h"
 #include "sci/sfx/iterator.h"
 #include "sci/sfx/misc.h"
 #include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index dd9e09d229..55af6791b3 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -31,7 +31,9 @@
 
 #include "sci/sci.h"
 #include "sci/gfx/menubar.h"
+#ifdef INCLUDE_OLDGFX
 #include "sci/gfx/gfx_state_internal.h"	// required for GfxPort, GfxContainer
+#endif
 #include "sci/sfx/core.h"
 #include "sci/sfx/iterator.h"
 #include "sci/engine/state.h"
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 57270a4705..a45abcc90e 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -36,8 +36,10 @@
 #include "sci/engine/kernel.h"
 
 #include "sci/gfx/operations.h"	// fog GfxState
+#ifdef INCLUDE_OLDGFX
 #include "sci/gfx/gfx_state_internal.h"	// required for GfxContainer, GfxPort, GfxVisual
 #include "sci/gui32/gui32.h"
+#endif
 #include "sci/gui/gui.h"
 #include "sci/gui/gui_palette.h"
 #include "sci/gui/gui_cursor.h"
@@ -120,9 +122,13 @@ Common::Error SciEngine::run() {
 	if (script_init_engine(_gamestate))
 		return Common::kUnknownError;
 
+#ifdef INCLUDE_OLDGFX
 	// Gui change
 	//_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor);    // new
 	_gamestate->_gui = new SciGui32(_gamestate, screen, palette, cursor);  // old
+#else
+	_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor);
+#endif
 
 	if (game_init(_gamestate)) { /* Initialize */
 		warning("Game initialization failed: Aborting...");