aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/console.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-03 14:22:50 +0000
committerFilippos Karapetis2009-07-03 14:22:50 +0000
commit6fa8541aed68e72fd4f1cdeb13a46ec95547b275 (patch)
tree6d4fd58ddf8c42bb34ccf153273cb9e441e30534 /engines/sci/console.cpp
parent69da51e71d71bb700a4e5e5419f64f482cb9fabc (diff)
downloadscummvm-rg350-6fa8541aed68e72fd4f1cdeb13a46ec95547b275.tar.gz
scummvm-rg350-6fa8541aed68e72fd4f1cdeb13a46ec95547b275.tar.bz2
scummvm-rg350-6fa8541aed68e72fd4f1cdeb13a46ec95547b275.zip
- Pushed debugstate into debug.h
- When an error occurs, manipulate the execution stack before error() opens the console inside getDebugger(), like FreeSCI did. Added another method for obtaining the SCI console for use by the engine itself. svn-id: r42062
Diffstat (limited to 'engines/sci/console.cpp')
-rw-r--r--engines/sci/console.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 002acbae86..bf919c3a25 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -50,7 +50,6 @@ int g_debug_sleeptime_factor = 1;
int g_debug_simulated_key = 0;
bool g_debug_track_mouse_clicks = false;
bool g_debug_weak_validations = true;
-extern DebugState debugState;
Console::Console(SciEngine *vm) : GUI::Debugger() {
_vm = vm;
@@ -1598,7 +1597,7 @@ bool Console::cmdGCObjects(int argc, const char **argv) {
void _print_address(void * _, reg_t addr) {
if (addr.segment)
- ((SciEngine *)g_engine)->getDebugger()->DebugPrintf(" %04x:%04x\n", PRINT_REG(addr));
+ ((SciEngine *)g_engine)->getSciDebugger()->DebugPrintf(" %04x:%04x\n", PRINT_REG(addr));
}
bool Console::cmdGCShowReachable(int argc, const char **argv) {