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/lure | |
| 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/lure')
| -rw-r--r-- | engines/lure/debugger.cpp | 2 | ||||
| -rw-r--r-- | engines/lure/fights.cpp | 3 | ||||
| -rw-r--r-- | engines/lure/game.cpp | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp index 3abc079a05..1cfe0804e4 100644 --- a/engines/lure/debugger.cpp +++ b/engines/lure/debugger.cpp @@ -105,7 +105,7 @@ bool Debugger::cmd_enterRoom(int argc, const char **argv) { if (!remoteFlag) res.getActiveHotspot(PLAYER_ID)->setRoomNumber(roomNumber); - _detach_now = true; + detach(); return false; } diff --git a/engines/lure/fights.cpp b/engines/lure/fights.cpp index 53539677c8..789c9d924e 100644 --- a/engines/lure/fights.cpp +++ b/engines/lure/fights.cpp @@ -132,8 +132,7 @@ void FightsManager::fightLoop() { } Screen::getReference().update(); - if (game.debugger().isAttached()) - game.debugger().onFrame(); + game.debugger().onFrame(); g_system->delayMillis(10); } diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp index d0f98b9c34..5d2f0e8ed1 100644 --- a/engines/lure/game.cpp +++ b/engines/lure/game.cpp @@ -281,8 +281,7 @@ void Game::execute() { system.updateScreen(); system.delayMillis(10); - if (_debugger->isAttached()) - _debugger->onFrame(); + _debugger->onFrame(); } room.leaveRoom(); |