diff options
| author | Max Horn | 2010-07-17 18:38:42 +0000 |
|---|---|---|
| committer | Max Horn | 2010-07-17 18:38:42 +0000 |
| commit | 1d4c82885ddcc0442671c863eef643aef2dc7dda (patch) | |
| tree | aba7524c27208b07bbf2e0e598b3d1b9fd21d769 /engines/kyra | |
| parent | 625af1260b2b6a28b57726564547d740fce35cad (diff) | |
| download | scummvm-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/kyra')
| -rw-r--r-- | engines/kyra/debugger.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp index d71f7b8b25..225b44b3f4 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/debugger.cpp @@ -240,7 +240,7 @@ bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) { while (!_vm->_screen->isMouseVisible()) _vm->_screen->showMouse(); - _detach_now = true; + detach(); return false; } @@ -327,7 +327,7 @@ bool Debugger_v2::cmd_enterScene(int argc, const char **argv) { while (!_vm->screen_v2()->isMouseVisible()) _vm->screen_v2()->showMouse(); - _detach_now = true; + detach(); return false; } diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index abe13cec2b..2c6cd3ab5c 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -336,7 +336,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag) break; } - if (_debugger && _debugger->isAttached()) + if (_debugger) _debugger->onFrame(); if (breakLoop) |