diff options
| author | Max Horn | 2009-02-21 22:50:35 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-21 22:50:35 +0000 |
| commit | 6f13850161c75151a24356ab94b3d25b2fe9964c (patch) | |
| tree | 85c2f8475a63d93ea267e9bc5940f933f6baa125 /engines/sci/engine | |
| parent | fe60f82e031f2d629469db2f2d17d8ac5e334326 (diff) | |
| download | scummvm-rg350-6f13850161c75151a24356ab94b3d25b2fe9964c.tar.gz scummvm-rg350-6f13850161c75151a24356ab94b3d25b2fe9964c.tar.bz2 scummvm-rg350-6f13850161c75151a24356ab94b3d25b2fe9964c.zip | |
SCI: Moved include/menubar.h -> gfx/menubar.h, untangled headers some more
svn-id: r38761
Diffstat (limited to 'engines/sci/engine')
| -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 |
7 files changed, 12 insertions, 6 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" |