[Scummvm-cvs-logs] SF.net SVN: scummvm:[54815] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Dec 7 19:54:21 CET 2010
Revision: 54815
http://scummvm.svn.sourceforge.net/scummvm/?rev=54815&view=rev
Author: fingolfin
Date: 2010-12-07 18:54:21 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
DEBUG: Let GUI::Debugger::preEnter and postEnter (un)pause the engine
Modified Paths:
--------------
scummvm/trunk/engines/agi/console.cpp
scummvm/trunk/engines/agos/debugger.cpp
scummvm/trunk/engines/agos/debugger.h
scummvm/trunk/engines/cine/console.cpp
scummvm/trunk/engines/cine/console.h
scummvm/trunk/engines/cruise/debugger.h
scummvm/trunk/engines/draci/console.cpp
scummvm/trunk/engines/draci/console.h
scummvm/trunk/engines/drascula/console.cpp
scummvm/trunk/engines/drascula/console.h
scummvm/trunk/engines/gob/console.cpp
scummvm/trunk/engines/gob/console.h
scummvm/trunk/engines/hugo/console.cpp
scummvm/trunk/engines/hugo/console.h
scummvm/trunk/engines/kyra/debugger.cpp
scummvm/trunk/engines/kyra/debugger.h
scummvm/trunk/engines/lure/debugger.h
scummvm/trunk/engines/made/console.cpp
scummvm/trunk/engines/made/console.h
scummvm/trunk/engines/mohawk/console.cpp
scummvm/trunk/engines/mohawk/console.h
scummvm/trunk/engines/parallaction/debug.cpp
scummvm/trunk/engines/parallaction/debug.h
scummvm/trunk/engines/queen/debug.cpp
scummvm/trunk/engines/queen/debug.h
scummvm/trunk/engines/sci/console.h
scummvm/trunk/engines/scumm/debugger.cpp
scummvm/trunk/engines/scumm/debugger.h
scummvm/trunk/engines/sky/debug.cpp
scummvm/trunk/engines/sky/debug.h
scummvm/trunk/engines/sword1/console.cpp
scummvm/trunk/engines/sword1/console.h
scummvm/trunk/engines/sword2/console.h
scummvm/trunk/engines/sword25/console.cpp
scummvm/trunk/engines/sword25/console.h
scummvm/trunk/engines/tinsel/debugger.h
scummvm/trunk/engines/toon/console.cpp
scummvm/trunk/engines/toon/console.h
scummvm/trunk/engines/touche/console.cpp
scummvm/trunk/engines/touche/console.h
scummvm/trunk/engines/tucker/console.cpp
scummvm/trunk/engines/tucker/console.h
scummvm/trunk/gui/debugger.cpp
scummvm/trunk/gui/debugger.h
Modified: scummvm/trunk/engines/agi/console.cpp
===================================================================
--- scummvm/trunk/engines/agi/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/agi/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -26,6 +26,7 @@
#include "agi/agi.h"
#include "agi/opcodes.h"
+#include "agi/preagi.h"
#include "agi/preagi_mickey.h"
#include "agi/preagi_winnie.h"
Modified: scummvm/trunk/engines/agos/debugger.cpp
===================================================================
--- scummvm/trunk/engines/agos/debugger.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/agos/debugger.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -53,16 +53,6 @@
}
-void Debugger::preEnter() {
- //_vm->_midi.pause(1);
-}
-
-
-void Debugger::postEnter() {
- //_vm->_midi.pause(0);
-}
-
-
bool Debugger::Cmd_DebugLevel(int argc, const char **argv) {
if (argc == 1) {
if (_vm->_debugMode == false)
Modified: scummvm/trunk/engines/agos/debugger.h
===================================================================
--- scummvm/trunk/engines/agos/debugger.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/agos/debugger.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,12 +37,9 @@
Debugger(AGOSEngine *vm);
virtual ~Debugger() {} // we need this for __SYMBIAN32__ archaic gcc/UIQ
-protected:
+private:
AGOSEngine *_vm;
- virtual void preEnter();
- virtual void postEnter();
-
bool Cmd_DebugLevel(int argc, const char **argv);
bool Cmd_PlayMusic(int argc, const char **argv);
bool Cmd_PlaySound(int argc, const char **argv);
Modified: scummvm/trunk/engines/cine/console.cpp
===================================================================
--- scummvm/trunk/engines/cine/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/cine/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -34,10 +34,4 @@
CineConsole::~CineConsole() {
}
-void CineConsole::preEnter() {
-}
-
-void CineConsole::postEnter() {
-}
-
} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/console.h
===================================================================
--- scummvm/trunk/engines/cine/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/cine/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
CineConsole(CineEngine *vm);
virtual ~CineConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
CineEngine *_vm;
};
Modified: scummvm/trunk/engines/cruise/debugger.h
===================================================================
--- scummvm/trunk/engines/cruise/debugger.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/cruise/debugger.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -35,7 +35,7 @@
Debugger();
virtual ~Debugger() {} // we need this for __SYMBIAN32__ archaic gcc/UIQ
-protected:
+private:
bool cmd_hotspots(int argc, const char **argv);
bool cmd_items(int argc, const char **argv);
};
Modified: scummvm/trunk/engines/draci/console.cpp
===================================================================
--- scummvm/trunk/engines/draci/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/draci/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -34,10 +34,4 @@
DraciConsole::~DraciConsole() {
}
-void DraciConsole::preEnter() {
-}
-
-void DraciConsole::postEnter() {
-}
-
} // End of namespace Draci
Modified: scummvm/trunk/engines/draci/console.h
===================================================================
--- scummvm/trunk/engines/draci/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/draci/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
DraciConsole(DraciEngine *vm);
virtual ~DraciConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
DraciEngine *_vm;
};
Modified: scummvm/trunk/engines/drascula/console.cpp
===================================================================
--- scummvm/trunk/engines/drascula/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/drascula/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -36,12 +36,6 @@
Console::~Console() {
}
-void Console::preEnter() {
-}
-
-void Console::postEnter() {
-}
-
bool Console::Cmd_Room(int argc, const char **argv) {
if (argc < 2) {
DebugPrintf("Usage: changeCard <card>\n");
Modified: scummvm/trunk/engines/drascula/console.h
===================================================================
--- scummvm/trunk/engines/drascula/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/drascula/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
Console(DrasculaEngine *vm);
virtual ~Console(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
DrasculaEngine *_vm;
Modified: scummvm/trunk/engines/gob/console.cpp
===================================================================
--- scummvm/trunk/engines/gob/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/gob/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -42,12 +42,6 @@
GobConsole::~GobConsole() {
}
-void GobConsole::preEnter() {
-}
-
-void GobConsole::postEnter() {
-}
-
bool GobConsole::cmd_varSize(int argc, const char **argv) {
DebugPrintf("Size of the variable space: %d bytes\n", _vm->_inter->_variables->getSize());
return true;
Modified: scummvm/trunk/engines/gob/console.h
===================================================================
--- scummvm/trunk/engines/gob/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/gob/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
GobConsole(GobEngine *vm);
virtual ~GobConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
GobEngine *_vm;
Modified: scummvm/trunk/engines/hugo/console.cpp
===================================================================
--- scummvm/trunk/engines/hugo/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/hugo/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -34,10 +34,4 @@
HugoConsole::~HugoConsole() {
}
-void HugoConsole::preEnter() {
-}
-
-void HugoConsole::postEnter() {
-}
-
} // End of namespace Hugo
Modified: scummvm/trunk/engines/hugo/console.h
===================================================================
--- scummvm/trunk/engines/hugo/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/hugo/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
HugoConsole(HugoEngine *vm);
virtual ~HugoConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
HugoEngine *_vm;
};
Modified: scummvm/trunk/engines/kyra/debugger.cpp
===================================================================
--- scummvm/trunk/engines/kyra/debugger.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/kyra/debugger.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -53,16 +53,6 @@
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)
Modified: scummvm/trunk/engines/kyra/debugger.h
===================================================================
--- scummvm/trunk/engines/kyra/debugger.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/kyra/debugger.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -41,9 +41,6 @@
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);
Modified: scummvm/trunk/engines/lure/debugger.h
===================================================================
--- scummvm/trunk/engines/lure/debugger.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/lure/debugger.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -35,7 +35,7 @@
Debugger();
virtual ~Debugger() {} // we need this for __SYMBIAN32__ archaic gcc/UIQ
-protected:
+private:
bool cmd_enterRoom(int argc, const char **argv);
bool cmd_listRooms(int argc, const char **argv);
bool cmd_listFields(int argc, const char **argv);
Modified: scummvm/trunk/engines/made/console.cpp
===================================================================
--- scummvm/trunk/engines/made/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/made/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -34,10 +34,4 @@
MadeConsole::~MadeConsole() {
}
-void MadeConsole::preEnter() {
-}
-
-void MadeConsole::postEnter() {
-}
-
} // End of namespace Made
Modified: scummvm/trunk/engines/made/console.h
===================================================================
--- scummvm/trunk/engines/made/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/made/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
MadeConsole(MadeEngine *vm);
virtual ~MadeConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
MadeEngine *_vm;
};
Modified: scummvm/trunk/engines/mohawk/console.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/mohawk/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -54,14 +54,6 @@
MystConsole::~MystConsole() {
}
-void MystConsole::preEnter() {
- _vm->_sound->pauseSound();
-}
-
-void MystConsole::postEnter() {
- _vm->_sound->resumeSound();
-}
-
bool MystConsole::Cmd_ChangeCard(int argc, const char **argv) {
if (argc < 2) {
DebugPrintf("Usage: changeCard <card>\n");
@@ -315,16 +307,7 @@
RivenConsole::~RivenConsole() {
}
-void RivenConsole::preEnter() {
- _vm->_sound->pauseSound();
- _vm->_sound->pauseSLST();
-}
-void RivenConsole::postEnter() {
- _vm->_sound->resumeSound();
- _vm->_sound->resumeSLST();
-}
-
bool RivenConsole::Cmd_ChangeCard(int argc, const char **argv) {
if (argc < 2) {
DebugPrintf("Usage: changeCard <card>\n");
@@ -658,14 +641,6 @@
LivingBooksConsole::~LivingBooksConsole() {
}
-void LivingBooksConsole::preEnter() {
- _vm->_sound->pauseSound();
-}
-
-void LivingBooksConsole::postEnter() {
- _vm->_sound->resumeSound();
-}
-
bool LivingBooksConsole::Cmd_PlaySound(int argc, const char **argv) {
if (argc == 1) {
DebugPrintf("Usage: playSound <value>\n");
Modified: scummvm/trunk/engines/mohawk/console.h
===================================================================
--- scummvm/trunk/engines/mohawk/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/mohawk/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -39,10 +39,6 @@
MystConsole(MohawkEngine_Myst *vm);
virtual ~MystConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
MohawkEngine_Myst *_vm;
@@ -66,10 +62,6 @@
RivenConsole(MohawkEngine_Riven *vm);
virtual ~RivenConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
MohawkEngine_Riven *_vm;
@@ -97,10 +89,6 @@
LivingBooksConsole(MohawkEngine_LivingBooks *vm);
virtual ~LivingBooksConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
MohawkEngine_LivingBooks *_vm;
Modified: scummvm/trunk/engines/parallaction/debug.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/debug.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/parallaction/debug.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -53,10 +53,12 @@
void Debugger::preEnter() {
_mouseState = _vm->_input->getMouseState();
+ _vm->pauseEngine(true);
}
void Debugger::postEnter() {
+ _vm->pauseEngine(false);
_vm->_input->setMouseState(_mouseState);
_vm->_input->setArrowCursor(); // unselects the active item, if any
}
Modified: scummvm/trunk/engines/parallaction/debug.h
===================================================================
--- scummvm/trunk/engines/parallaction/debug.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/parallaction/debug.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -14,13 +14,14 @@
Debugger(Parallaction *vm);
virtual ~Debugger() {} // we need this for __SYMBIAN32__ archaic gcc/UIQ
-protected:
+private:
+ virtual void preEnter();
+ virtual void postEnter();
+
+private:
Parallaction *_vm;
MouseTriState _mouseState;
- virtual void preEnter();
- virtual void postEnter();
-
bool Cmd_DebugLevel(int argc, const char **argv);
bool Cmd_Location(int argc, const char **argv);
bool Cmd_Give(int argc, const char **argv);
Modified: scummvm/trunk/engines/queen/debug.cpp
===================================================================
--- scummvm/trunk/engines/queen/debug.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/queen/debug.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -50,10 +50,13 @@
}
Debugger::~Debugger() {} // we need this here for __SYMBIAN32__
+
void Debugger::preEnter() {
+ _vm->pauseEngine(true);
}
void Debugger::postEnter() {
+ _vm->pauseEngine(false);
_vm->graphics()->setupMouseCursor();
}
Modified: scummvm/trunk/engines/queen/debug.h
===================================================================
--- scummvm/trunk/engines/queen/debug.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/queen/debug.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -34,7 +34,6 @@
class Debugger : public GUI::Debugger {
public:
-
Debugger(QueenEngine *vm);
virtual ~Debugger(); // we need this here for __SYMBIAN32__ archaic gcc/UIQ
@@ -44,11 +43,11 @@
DF_DRAW_AREAS = 1 << 0
};
-protected:
-
+private:
virtual void preEnter();
virtual void postEnter();
+private:
bool Cmd_Areas(int argc, const char **argv);
bool Cmd_Asm(int argc, const char **argv);
bool Cmd_Bob(int argc, const char **argv);
@@ -60,7 +59,6 @@
bool Cmd_Song(int argc, const char **argv);
private:
-
QueenEngine *_vm;
int _flags;
};
Modified: scummvm/trunk/engines/sci/console.h
===================================================================
--- scummvm/trunk/engines/sci/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/sci/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -42,12 +42,14 @@
public:
Console(SciEngine *engine);
virtual ~Console();
- void preEnter();
- void postEnter();
int printObject(reg_t pos);
private:
+ virtual void preEnter();
+ virtual void postEnter();
+
+private:
// General
bool cmdHelp(int argc, const char **argv);
// Kernel
Modified: scummvm/trunk/engines/scumm/debugger.cpp
===================================================================
--- scummvm/trunk/engines/scumm/debugger.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/scumm/debugger.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -107,17 +107,6 @@
// we need this destructor, even if it is empty, for __SYMBIAN32__
}
-void ScummDebugger::preEnter() {
- // Pause sound output
- _old_soundsPaused = _vm->_sound->_soundsPaused;
- _vm->_sound->pauseSounds(true);
-}
-
-void ScummDebugger::postEnter() {
- // Resume previous sound state
- _vm->_sound->pauseSounds(_old_soundsPaused);
-}
-
///////////////////////////////////////////////////
// Now the fun stuff:
Modified: scummvm/trunk/engines/scumm/debugger.h
===================================================================
--- scummvm/trunk/engines/scumm/debugger.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/scumm/debugger.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -36,13 +36,10 @@
ScummDebugger(ScummEngine *s);
virtual ~ScummDebugger(); // we need this here for __SYMBIAN32__
-protected:
+private:
ScummEngine *_vm;
bool _old_soundsPaused;
- virtual void preEnter();
- virtual void postEnter();
-
// Commands
bool Cmd_Room(int argc, const char **argv);
bool Cmd_LoadGame(int argc, const char **argv);
Modified: scummvm/trunk/engines/sky/debug.cpp
===================================================================
--- scummvm/trunk/engines/sky/debug.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/sky/debug.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -1103,10 +1103,11 @@
Debugger::~Debugger() {} // we need this here for __SYMBIAN32__
void Debugger::preEnter() {
-
+ ::GUI::Debugger::preEnter();
}
void Debugger::postEnter() {
+ ::GUI::Debugger::postEnter();
_mouse->resetCursor();
}
Modified: scummvm/trunk/engines/sky/debug.h
===================================================================
--- scummvm/trunk/engines/sky/debug.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/sky/debug.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -43,10 +43,11 @@
virtual ~Debugger(); // we need this here for __SYMBIAN32__ archaic gcc/UIQ
bool showGrid() { return _showGrid; }
-protected:
+private:
virtual void preEnter();
virtual void postEnter();
+private:
bool Cmd_ShowGrid(int argc, const char **argv);
bool Cmd_ReloadGrid(int argc, const char **argv);
bool Cmd_ShowCompact(int argc, const char **argv);
Modified: scummvm/trunk/engines/sword1/console.cpp
===================================================================
--- scummvm/trunk/engines/sword1/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/sword1/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -34,10 +34,4 @@
SwordConsole::~SwordConsole() {
}
-void SwordConsole::preEnter() {
-}
-
-void SwordConsole::postEnter() {
-}
-
} // End of namespace Sword
Modified: scummvm/trunk/engines/sword1/console.h
===================================================================
--- scummvm/trunk/engines/sword1/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/sword1/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
SwordConsole(SwordEngine *vm);
virtual ~SwordConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
SwordEngine *_vm;
};
Modified: scummvm/trunk/engines/sword2/console.h
===================================================================
--- scummvm/trunk/engines/sword2/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/sword2/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -82,12 +82,13 @@
void buildDebugText();
void drawDebugGraphics();
-protected:
- Sword2Engine *_vm;
-
+private:
virtual void preEnter();
virtual void postEnter();
+private:
+ Sword2Engine *_vm;
+
// Commands
bool Cmd_Mem(int argc, const char **argv);
bool Cmd_Tony(int argc, const char **argv);
Modified: scummvm/trunk/engines/sword25/console.cpp
===================================================================
--- scummvm/trunk/engines/sword25/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/sword25/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -34,10 +34,4 @@
Sword25Console::~Sword25Console() {
}
-void Sword25Console::preEnter() {
-}
-
-void Sword25Console::postEnter() {
-}
-
} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/console.h
===================================================================
--- scummvm/trunk/engines/sword25/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/sword25/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
Sword25Console(Sword25Engine *vm);
virtual ~Sword25Console(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
Sword25Engine *_vm;
};
Modified: scummvm/trunk/engines/tinsel/debugger.h
===================================================================
--- scummvm/trunk/engines/tinsel/debugger.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/tinsel/debugger.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -33,15 +33,16 @@
class TinselEngine;
class Console: public GUI::Debugger {
-protected:
+public:
+ Console();
+ virtual ~Console();
+
+private:
bool cmd_item(int argc, const char **argv);
bool cmd_scene(int argc, const char **argv);
bool cmd_music(int argc, const char **argv);
bool cmd_sound(int argc, const char **argv);
bool cmd_string(int argc, const char **argv);
-public:
- Console();
- virtual ~Console();
};
} // End of namespace Tinsel
Modified: scummvm/trunk/engines/toon/console.cpp
===================================================================
--- scummvm/trunk/engines/toon/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/toon/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -34,10 +34,4 @@
ToonConsole::~ToonConsole() {
}
-void ToonConsole::preEnter() {
-}
-
-void ToonConsole::postEnter() {
-}
-
} // End of namespace Toon
Modified: scummvm/trunk/engines/toon/console.h
===================================================================
--- scummvm/trunk/engines/toon/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/toon/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
ToonConsole(ToonEngine *vm);
virtual ~ToonConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
ToonEngine *_vm;
};
Modified: scummvm/trunk/engines/touche/console.cpp
===================================================================
--- scummvm/trunk/engines/touche/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/touche/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -34,10 +34,4 @@
ToucheConsole::~ToucheConsole() {
}
-void ToucheConsole::preEnter() {
-}
-
-void ToucheConsole::postEnter() {
-}
-
} // End of namespace Touche
Modified: scummvm/trunk/engines/touche/console.h
===================================================================
--- scummvm/trunk/engines/touche/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/touche/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
ToucheConsole(ToucheEngine *vm);
virtual ~ToucheConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
ToucheEngine *_vm;
};
Modified: scummvm/trunk/engines/tucker/console.cpp
===================================================================
--- scummvm/trunk/engines/tucker/console.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/tucker/console.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -28,16 +28,10 @@
namespace Tucker {
-TuckerConsole::TuckerConsole(TuckerEngine *vm) : GUI::Debugger(), _vm(vm) {
+TuckerConsole::TuckerConsole(TuckerEngine *vm) : _vm(vm) {
}
TuckerConsole::~TuckerConsole() {
}
-void TuckerConsole::preEnter() {
-}
-
-void TuckerConsole::postEnter() {
-}
-
} // End of namespace Tucker
Modified: scummvm/trunk/engines/tucker/console.h
===================================================================
--- scummvm/trunk/engines/tucker/console.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/engines/tucker/console.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -37,10 +37,6 @@
TuckerConsole(TuckerEngine *vm);
virtual ~TuckerConsole(void);
-protected:
- virtual void preEnter();
- virtual void postEnter();
-
private:
TuckerEngine *_vm;
};
Modified: scummvm/trunk/gui/debugger.cpp
===================================================================
--- scummvm/trunk/gui/debugger.cpp 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/gui/debugger.cpp 2010-12-07 18:54:21 UTC (rev 54815)
@@ -30,6 +30,8 @@
#include "common/debug-channels.h"
#include "common/system.h"
+#include "engines/engine.h"
+
#include "gui/debugger.h"
#ifndef USE_TEXT_CONSOLE
#include "gui/console.h"
@@ -89,6 +91,14 @@
return count;
}
+void Debugger::preEnter() {
+ g_engine->pauseEngine(true);
+}
+
+void Debugger::postEnter() {
+ g_engine->pauseEngine(false);
+}
+
void Debugger::attach(const char *entry) {
g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
Modified: scummvm/trunk/gui/debugger.h
===================================================================
--- scummvm/trunk/gui/debugger.h 2010-12-07 18:33:58 UTC (rev 54814)
+++ scummvm/trunk/gui/debugger.h 2010-12-07 18:54:21 UTC (rev 54815)
@@ -155,14 +155,18 @@
/**
* Hook for subclasses which is called just before enter() is run.
* A typical usage example is pausing music and sound effects.
+ *
+ * The default implementation invokes Engine::pauseEngine(true).
*/
- virtual void preEnter() {}
+ virtual void preEnter();
/**
* Hook for subclasses which is called just after enter() was run.
* A typical usage example is resuming music and sound effects.
+ *
+ * The default implementation invokes Engine::pauseEngine(false).
*/
- virtual void postEnter() {}
+ virtual void postEnter();
/**
* Subclasses should invoke the detach() method in their Cmd_FOO methods
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list