diff options
| author | Filippos Karapetis | 2009-10-30 12:33:05 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-10-30 12:33:05 +0000 |
| commit | ff284c9f5bea8a9eaeadf0328230cfc72ab2f96c (patch) | |
| tree | b0968f38eee019fdedfab19ee65babd2ff5c8e95 /engines/sci/engine | |
| parent | 272cc757152e0fc8f2c1821871c8f108f05c20ce (diff) | |
| download | scummvm-rg350-ff284c9f5bea8a9eaeadf0328230cfc72ab2f96c.tar.gz scummvm-rg350-ff284c9f5bea8a9eaeadf0328230cfc72ab2f96c.tar.bz2 scummvm-rg350-ff284c9f5bea8a9eaeadf0328230cfc72ab2f96c.zip | |
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
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/game.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kevent.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kmenu.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 2 |
5 files changed, 10 insertions, 5 deletions
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" |