[Scummvm-cvs-logs] SF.net SVN: scummvm:[54032] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 54032
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54032&view=rev
Author:   lordhoto
Date:     2010-11-01 22:19:16 +0000 (Mon, 01 Nov 2010)

Log Message:
-----------
KYRA: Pause engine when the debugger is open.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/debugger.cpp
    scummvm/trunk/engines/kyra/debugger.h

Modified: scummvm/trunk/engines/kyra/debugger.cpp
===================================================================
--- scummvm/trunk/engines/kyra/debugger.cpp	2010-11-01 21:37:47 UTC (rev 54031)
+++ scummvm/trunk/engines/kyra/debugger.cpp	2010-11-01 22:19:16 UTC (rev 54032)
@@ -53,6 +53,16 @@
 	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 @@
 	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) {

Modified: scummvm/trunk/engines/kyra/debugger.h
===================================================================
--- scummvm/trunk/engines/kyra/debugger.h	2010-11-01 21:37:47 UTC (rev 54031)
+++ scummvm/trunk/engines/kyra/debugger.h	2010-11-01 22:19:16 UTC (rev 54032)
@@ -41,6 +41,9 @@
 	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 @@
 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.