From 8252fc30ce600960dc855dcecfa29092c5d6ef57 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 1 Nov 2010 22:19:16 +0000 Subject: KYRA: Pause engine when the debugger is open. svn-id: r54032 --- engines/kyra/debugger.cpp | 18 ++++++++++-------- engines/kyra/debugger.h | 6 +++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp index 8e264885a1..d58494303c 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/debugger.cpp @@ -53,6 +53,16 @@ Debugger::Debugger(KyraEngine_v1 *vm) DCmd_Register("settimercountdown", WRAP_METHOD(Debugger, cmd_setTimerCountdown)); } +void Debugger::preEnter() { + _vm->pauseEngine(true); + ::GUI::Debugger::preEnter(); +} + +void Debugger::postEnter() { + ::GUI::Debugger::postEnter(); + _vm->pauseEngine(false); +} + bool Debugger::cmd_setScreenDebug(int argc, const char **argv) { if (argc > 1) { if (scumm_stricmp(argv[1], "enable") == 0) @@ -201,14 +211,6 @@ Debugger_LoK::Debugger_LoK(KyraEngine_LoK *vm) DCmd_Register("birthstones", WRAP_METHOD(Debugger_LoK, cmd_listBirthstones)); } -void Debugger_LoK::preEnter() { - //_vm->midi.pause(1); -} - -void Debugger_LoK::postEnter() { - //_vm->midi.pause(0); -} - bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) { uint direction = 0; if (argc > 1) { diff --git a/engines/kyra/debugger.h b/engines/kyra/debugger.h index c9cf6dba2a..dfc2a26aa2 100644 --- a/engines/kyra/debugger.h +++ b/engines/kyra/debugger.h @@ -41,6 +41,9 @@ public: virtual ~Debugger() {} // we need this for __SYMBIAN32__ archaic gcc/UIQ protected: + virtual void preEnter(); + virtual void postEnter(); + KyraEngine_v1 *_vm; bool cmd_setScreenDebug(int argc, const char **argv); @@ -62,9 +65,6 @@ public: protected: KyraEngine_LoK *_vm; - virtual void preEnter(); - virtual void postEnter(); - bool cmd_enterRoom(int argc, const char **argv); bool cmd_listScenes(int argc, const char **argv); bool cmd_giveItem(int argc, const char **argv); -- cgit v1.2.3