aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/sci/engine/kernel.h1
-rw-r--r--engines/sci/engine/scriptconsole.cpp1
-rw-r--r--engines/sci/engine/state.h3
-rw-r--r--engines/sci/gfx/operations.cpp1
-rw-r--r--engines/sci/sci.cpp6
-rw-r--r--engines/sci/sci.h5
-rw-r--r--engines/sci/scicore/sciconsole.cpp1
7 files changed, 13 insertions, 5 deletions
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index e9ec6922b1..ece37d1f6c 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -32,7 +32,6 @@
#include "sci/engine/kdebug.h"
#include "sci/uinput.h"
-#include "sci/scicore/sciconsole.h" /* sciprintf() */
namespace Sci {
diff --git a/engines/sci/engine/scriptconsole.cpp b/engines/sci/engine/scriptconsole.cpp
index 137374f549..1eae635dc3 100644
--- a/engines/sci/engine/scriptconsole.cpp
+++ b/engines/sci/engine/scriptconsole.cpp
@@ -28,6 +28,7 @@
#include "sci/sci_memory.h"
#include "sci/engine/state.h"
+#include "sci/scicore/sciconsole.h"
namespace Sci {
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 3d83671e83..d8068a0c99 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -37,8 +37,7 @@ namespace Common {
#include "sci/scicore/vocabulary.h"
#include "sci/scicore/resource.h"
-#include "sci/scicore/sciconsole.h"
-#include "sci/scicore/versions.h"
+ #include "sci/scicore/versions.h"
#include "sci/engine/kernel.h" // for kfunct_sig_pair_t
#include "sci/engine/script.h"
#include "sci/engine/seg_manager.h"
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index e9e3b6ee24..87b5d4e483 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -29,6 +29,7 @@
#include "sci/gfx/operations.h"
#include "sci/gfx/font.h"
#include "sci/sci.h" // for g_engine, evil hack
+#include "sci/console.h"
#include "common/system.h"
#include "common/events.h"
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 4fb814e198..9c799f7fd7 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -30,6 +30,8 @@
#include "engines/advancedDetector.h"
#include "sci/sci.h"
#include "sci/console.h"
+#include "sci/scicore/sciconsole.h"
+
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
@@ -303,6 +305,10 @@ Common::Error SciEngine::run() {
return Common::kNoError;
}
+GUI::Debugger *SciEngine::getDebugger() {
+ return _console;
+}
+
const char* SciEngine::getGameID() const {
return _gameDescription->desc.gameid;
}
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index a92356a396..9640229f59 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -29,11 +29,12 @@
#include "engines/engine.h"
#include "engines/advancedDetector.h"
-#include "sci/console.h"
#include "sci/scicore/resource.h"
namespace Sci {
+struct Console;
+
// our engine debug levels
enum kDebugLevels {
kDebugLevelError = 1 << 0,
@@ -79,7 +80,7 @@ public:
// Engine APIs
virtual Common::Error run();
- virtual GUI::Debugger *getDebugger() { return _console; }
+ virtual GUI::Debugger *getDebugger();
const char* getGameID() const;
int getResourceVersion() const;
diff --git a/engines/sci/scicore/sciconsole.cpp b/engines/sci/scicore/sciconsole.cpp
index 3e70dfe64c..0f5ea18017 100644
--- a/engines/sci/scicore/sciconsole.cpp
+++ b/engines/sci/scicore/sciconsole.cpp
@@ -28,6 +28,7 @@
#include "sci/sci_memory.h"
#include "sci/engine/state.h"
+#include "sci/scicore/sciconsole.h"
namespace Sci {