diff options
| -rw-r--r-- | base/engine.cpp | 2 | ||||
| -rw-r--r-- | base/engine.h | 5 | ||||
| -rw-r--r-- | base/gameDetector.cpp | 3 | ||||
| -rw-r--r-- | base/gameDetector.h | 2 | ||||
| -rw-r--r-- | queen/display.cpp | 1 | ||||
| -rw-r--r-- | queen/queen.h | 1 | ||||
| -rw-r--r-- | saga/input.cpp | 2 | ||||
| -rw-r--r-- | scumm/cursor.cpp | 1 | ||||
| -rw-r--r-- | scumm/debugger.cpp | 2 | ||||
| -rw-r--r-- | scumm/gfx.cpp | 1 | ||||
| -rw-r--r-- | scumm/palette.cpp | 1 | ||||
| -rw-r--r-- | simon/debugger.cpp | 2 | ||||
| -rw-r--r-- | sword2/sword2.h | 2 |
13 files changed, 21 insertions, 4 deletions
diff --git a/base/engine.cpp b/base/engine.cpp index b69e6c6a2a..aabf41822f 100644 --- a/base/engine.cpp +++ b/base/engine.cpp @@ -23,10 +23,12 @@ #include <malloc.h> #endif #include "base/engine.h" +#include "base/gameDetector.h" #include "common/config-manager.h" #include "common/file.h" #include "common/timer.h" #include "common/scaler.h" // For GFX_NORMAL +#include "common/system.h" #include "sound/mixer.h" /* FIXME - BIG HACK for MidiEmu */ diff --git a/base/engine.h b/base/engine.h index 8ee85e6b40..8c907e0ede 100644 --- a/base/engine.h +++ b/base/engine.h @@ -23,9 +23,10 @@ #include "common/scummsys.h" #include "common/str.h" -#include "common/system.h" -#include "base/gameDetector.h" +class GameDetector; +class OSystem; +class SaveFileManager; class SoundMixer; class Timer; diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 31b619fa55..e371cf2924 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -46,6 +46,9 @@ #endif #endif +extern int gDebugLevel; + + // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) #ifdef __PALM_OS__ static const char USAGE_STRING[] = "NoUsageString"; // save more data segment space diff --git a/base/gameDetector.h b/base/gameDetector.h index fc45afd613..e74176d5a4 100644 --- a/base/gameDetector.h +++ b/base/gameDetector.h @@ -38,8 +38,6 @@ enum { GF_DEFAULT_TO_1X_SCALER = 1 << 30 }; -extern int gDebugLevel; - struct GameSettings { const char *name; const char *description; diff --git a/queen/display.cpp b/queen/display.cpp index 16bb4a74a7..e851bc3dd5 100644 --- a/queen/display.cpp +++ b/queen/display.cpp @@ -20,6 +20,7 @@ */ #include "stdafx.h" +#include "common/system.h" #include "queen/display.h" #include "queen/input.h" diff --git a/queen/queen.h b/queen/queen.h index f3da0e8fb3..626ff4c93e 100644 --- a/queen/queen.h +++ b/queen/queen.h @@ -25,6 +25,7 @@ #include "base/engine.h" class GameDetector; +class SaveFile; #if defined(_WIN32_WCE) && (_WIN32_WCE <= 300) diff --git a/saga/input.cpp b/saga/input.cpp index 0a162649c7..3a183b6ca3 100644 --- a/saga/input.cpp +++ b/saga/input.cpp @@ -30,6 +30,8 @@ #include "saga/scene.h" #include "saga/script.h" +#include "common/system.h" + namespace Saga { int SagaEngine::processInput() { diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp index 08dc983f73..c7d9b1d5a2 100644 --- a/scumm/cursor.cpp +++ b/scumm/cursor.cpp @@ -20,6 +20,7 @@ */ #include "stdafx.h" +#include "common/system.h" #include "scumm/bomp.h" #include "scumm/charset.h" #include "scumm/intern.h" diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp index 2a94c96b93..4a97fff3e4 100644 --- a/scumm/debugger.cpp +++ b/scumm/debugger.cpp @@ -36,6 +36,8 @@ #include "common/debugger.cpp" +extern int gDebugLevel; + namespace Scumm { void CDECL debugC(int channel, const char *s, ...) { diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index d956852c17..cbe686541a 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -20,6 +20,7 @@ */ #include "stdafx.h" +#include "common/system.h" #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/charset.h" diff --git a/scumm/palette.cpp b/scumm/palette.cpp index 04cabf3944..d0e3d5d23a 100644 --- a/scumm/palette.cpp +++ b/scumm/palette.cpp @@ -20,6 +20,7 @@ */ #include "stdafx.h" +#include "common/system.h" #include "common/util.h" #include "scumm/scumm.h" #include "scumm/intern.h" diff --git a/simon/debugger.cpp b/simon/debugger.cpp index e0c35e991c..3dec5bc089 100644 --- a/simon/debugger.cpp +++ b/simon/debugger.cpp @@ -25,6 +25,8 @@ #include "simon/debugger.h" #include "simon/simon.h" +extern int gDebugLevel; + namespace Simon { Debugger::Debugger(SimonEngine *vm) diff --git a/sword2/sword2.h b/sword2/sword2.h index 84a3084c73..7e4973249c 100644 --- a/sword2/sword2.h +++ b/sword2/sword2.h @@ -29,6 +29,8 @@ #include "base/engine.h" +#include "common/system.h" + #include "sword2/driver/driver96.h" #include "sword2/build_display.h" #include "sword2/header.h" |