aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/vm.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-08 13:08:51 +0000
committerFilippos Karapetis2009-07-08 13:08:51 +0000
commit5ca94c5cce2ca0b42bb678835d9e141456bbae5b (patch)
treee0703cf1f64c321452e9496201ea040ade11aa7e /engines/sci/engine/vm.cpp
parentd351c7b9cb6cb46da9bb141c9ca90aba021c1602 (diff)
downloadscummvm-rg350-5ca94c5cce2ca0b42bb678835d9e141456bbae5b.tar.gz
scummvm-rg350-5ca94c5cce2ca0b42bb678835d9e141456bbae5b.tar.bz2
scummvm-rg350-5ca94c5cce2ca0b42bb678835d9e141456bbae5b.zip
- Moved printObject inside the Console class
- Enabled the parts where disassemble() is called svn-id: r42263
Diffstat (limited to 'engines/sci/engine/vm.cpp')
-rw-r--r--engines/sci/engine/vm.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 9bbdb90e0c..e0ac60f152 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -1972,8 +1972,6 @@ static EngineState *_game_run(EngineState *&s, int restoring) {
return s;
}
-int printObject(EngineState *s, reg_t pos);
-
int game_run(EngineState **_s) {
EngineState *s = *_s;
@@ -1982,7 +1980,8 @@ int game_run(EngineState **_s) {
// Now: Register the first element on the execution stack-
if (!send_selector(s, s->game_obj, s->game_obj, s->stack_base, 2, s->stack_base)) {
- printObject(s, s->game_obj);
+ Console *con = ((SciEngine *)g_engine)->getSciDebugger();
+ con->printObject(s->game_obj);
warning("Failed to run the game! Aborting...");
return 1;
}