diff options
-rw-r--r-- | engines/sci/engine/game.cpp | 2 | ||||
-rw-r--r-- | engines/sci/engine/kevent.cpp | 1 | ||||
-rw-r--r-- | engines/sci/engine/kmenu.cpp | 1 | ||||
-rw-r--r-- | engines/sci/engine/kpathing.cpp | 1 | ||||
-rw-r--r-- | engines/sci/engine/savegame.cfsml | 6 | ||||
-rw-r--r-- | engines/sci/engine/savegame.cpp | 6 | ||||
-rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 1 | ||||
-rw-r--r-- | engines/sci/gfx/menubar.cpp | 2 | ||||
-rw-r--r-- | engines/sci/gfx/menubar.h (renamed from engines/sci/include/menubar.h) | 3 | ||||
-rw-r--r-- | engines/sci/gfx/sci_widgets.cpp | 2 | ||||
-rw-r--r-- | engines/sci/include/engine.h | 3 | ||||
-rw-r--r-- | engines/sci/include/sci_widgets.h | 2 |
12 files changed, 21 insertions, 9 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp index 870f27829d..4fd9b0208c 100644 --- a/engines/sci/engine/game.cpp +++ b/engines/sci/engine/game.cpp @@ -30,6 +30,8 @@ #include "sci/include/versions.h" #include "sci/include/kernel.h" #include "sci/engine/kernel_types.h" +#include "sci/gfx/gfx_widgets.h" +#include "sci/gfx/menubar.h" namespace Sci { diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp index 5723a72115..b03ef45c19 100644 --- a/engines/sci/engine/kevent.cpp +++ b/engines/sci/engine/kevent.cpp @@ -24,6 +24,7 @@ */ #include "sci/include/engine.h" +#include "sci/gfx/gfx_widgets.h" namespace Sci { diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp index 21374f555d..7546c8b712 100644 --- a/engines/sci/engine/kmenu.cpp +++ b/engines/sci/engine/kmenu.cpp @@ -26,6 +26,7 @@ #include "sci/include/sciresource.h" #include "sci/include/engine.h" #include "sci/include/sci_widgets.h" +#include "sci/gfx/menubar.h" namespace Sci { diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp index 222231e009..e61bee0391 100644 --- a/engines/sci/engine/kpathing.cpp +++ b/engines/sci/engine/kpathing.cpp @@ -30,6 +30,7 @@ #include "sci/include/engine.h" #include "sci/include/aatree.h" #include "sci/include/list.h" +#include "sci/gfx/gfx_widgets.h" namespace Sci { diff --git a/engines/sci/engine/savegame.cfsml b/engines/sci/engine/savegame.cfsml index a52a102c77..d977ec8eb9 100644 --- a/engines/sci/engine/savegame.cfsml +++ b/engines/sci/engine/savegame.cfsml @@ -29,15 +29,15 @@ ** savegame.cfsml. If this doesn't solve your problem, contact the maintainer. */ -#include <stdarg.h> #include <time.h> // FIXME: For struct tm +#include "common/stream.h" +#include "common/system.h" #include "sci/include/sci_memory.h" #include "sci/gfx/gfx_operations.h" +#include "sci/gfx/menubar.h" #include "sci/sfx/sfx_engine.h" #include "sci/include/engine.h" #include "sci/engine/heap.h" -#include "common/stream.h" -#include "common/system.h" #ifdef _MSC_VER #include <direct.h> diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index c8ce52f141..2fd439bf4f 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -29,15 +29,15 @@ ** savegame.cfsml. If this doesn't solve your problem, contact the maintainer. */ -#include <stdarg.h> #include <time.h> // FIXME: For struct tm +#include "common/stream.h" +#include "common/system.h" #include "sci/include/sci_memory.h" #include "sci/gfx/gfx_operations.h" +#include "sci/gfx/menubar.h" #include "sci/sfx/sfx_engine.h" #include "sci/include/engine.h" #include "sci/engine/heap.h" -#include "common/stream.h" -#include "common/system.h" #ifdef _MSC_VER #include <direct.h> diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 4760fdf286..bb6ea309d1 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -35,6 +35,7 @@ #include "sci/include/sci_midi.h" #include "sci/include/sci_widgets.h" #include "sci/sci.h" +#include "sci/gfx/gfx_widgets.h" #include "common/util.h" #include "common/savefile.h" diff --git a/engines/sci/gfx/menubar.cpp b/engines/sci/gfx/menubar.cpp index 57ecc6cc44..c125f48593 100644 --- a/engines/sci/gfx/menubar.cpp +++ b/engines/sci/gfx/menubar.cpp @@ -30,7 +30,7 @@ #include "sci/include/sci_memory.h" #include "sci/include/engine.h" -#include "sci/include/menubar.h" +#include "sci/gfx/menubar.h" namespace Sci { diff --git a/engines/sci/include/menubar.h b/engines/sci/gfx/menubar.h index aed7b2de73..7b163532f7 100644 --- a/engines/sci/include/menubar.h +++ b/engines/sci/gfx/menubar.h @@ -28,11 +28,14 @@ #ifndef _SCI_MENUBAR_H_ #define _SCI_MENUBAR_H_ +#include "sci/include/vm_types.h" #include "sci/gfx/gfx_operations.h" #include "sci/gfx/gfx_widgets.h" namespace Sci { +struct EngineState; + #define MENU_FREESCI_BLATANT_PLUG 0xfff0 /* This adds an "About FreeSCI" menu option to the first menu */ diff --git a/engines/sci/gfx/sci_widgets.cpp b/engines/sci/gfx/sci_widgets.cpp index 7e853904db..68182ec0d0 100644 --- a/engines/sci/gfx/sci_widgets.cpp +++ b/engines/sci/gfx/sci_widgets.cpp @@ -26,7 +26,7 @@ #include "sci/gfx/gfx_operations.h" #include "sci/gfx/gfx_widgets.h" #include "sci/include/engine.h" -#include "sci/include/menubar.h" +#include "sci/gfx/menubar.h" #include "sci/include/sci_widgets.h" namespace Sci { diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h index 37c52d8af1..2a588153db 100644 --- a/engines/sci/include/engine.h +++ b/engines/sci/include/engine.h @@ -38,7 +38,6 @@ namespace Common { #include "sci/include/script.h" #include "sci/include/sciconsole.h" #include "sci/include/vm.h" -#include "sci/include/menubar.h" #include "sci/include/versions.h" #include "sci/include/kernel.h" #include "sci/engine/seg_manager.h" @@ -47,6 +46,8 @@ namespace Common { namespace Sci { +struct menubar_t; + #define FREESCI_CURRENT_SAVEGAME_VERSION 8 #define FREESCI_MINIMUM_SAVEGAME_VERSION 8 diff --git a/engines/sci/include/sci_widgets.h b/engines/sci/include/sci_widgets.h index d2b8e0320d..4c03b072de 100644 --- a/engines/sci/include/sci_widgets.h +++ b/engines/sci/include/sci_widgets.h @@ -32,6 +32,8 @@ namespace Sci { +struct menu_t; + /* The following flags are applicable to windows in SCI0: */ #define WINDOW_FLAG_TRANSPARENT 0x01 |