aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorMax Horn2010-07-17 18:38:42 +0000
committerMax Horn2010-07-17 18:38:42 +0000
commit1d4c82885ddcc0442671c863eef643aef2dc7dda (patch)
treeaba7524c27208b07bbf2e0e598b3d1b9fd21d769 /engines/sci/engine
parent625af1260b2b6a28b57726564547d740fce35cad (diff)
downloadscummvm-rg350-1d4c82885ddcc0442671c863eef643aef2dc7dda.tar.gz
scummvm-rg350-1d4c82885ddcc0442671c863eef643aef2dc7dda.tar.bz2
scummvm-rg350-1d4c82885ddcc0442671c863eef643aef2dc7dda.zip
DEBUGGER: Simplify how our console debugger works / is used
* Remove _isAttached member var and isAttached method * Engines now always call the onFrame method; whether it does something is decided by the debugger class resp. its subclasses * Make detach() protected instead of private, so that subclasses can invoke it * Remove _detach_now member var (call detach() instead). * Rename _frame_countdown to _frameCountdown and properly document it. * Add more doxygen comments * Cleanup svn-id: r50963
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/vm.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index c7909672e5..900d843867 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -1085,9 +1085,7 @@ void run_vm(EngineState *s, bool restoring) {
g_sci->_debugState.breakpointWasHit = false;
}
Console *con = g_sci->getSciDebugger();
- if (con->isAttached()) {
- con->onFrame();
- }
+ con->onFrame();
if (s->xs->sp < s->xs->fp)
error("run_vm(): stack underflow, sp: %04x:%04x, fp: %04x:%04x",