diff options
| author | Max Horn | 2002-12-16 22:43:37 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-16 22:43:37 +0000 |
| commit | 99a8e393169182992e4fd0758c6064fbb731beec (patch) | |
| tree | 5a1fa7ada8e4747372412b5c1cd49b73155c40ee | |
| parent | 27f896deca47076fa074934f796c2e1211915c6e (diff) | |
| download | scummvm-rg350-99a8e393169182992e4fd0758c6064fbb731beec.tar.gz scummvm-rg350-99a8e393169182992e4fd0758c6064fbb731beec.tar.bz2 scummvm-rg350-99a8e393169182992e4fd0758c6064fbb731beec.zip | |
Endy, when I am gonna meet you, I'll have to kick, punch and bite you a bit for using the same name for two entierly different classes, then adding new files (and at the same time not removing obsolete files), and finally using the WRONG BLOODY HEADER. I spent an hour to track this one down
svn-id: r6004
| -rw-r--r-- | scumm/scumm.h | 1 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 92e0980d5d..5e0c54a005 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -360,7 +360,6 @@ public: void pauseDialog(); void saveloadDialog(); void optionsDialog(); - void debuggerDialog(); void displayError(const char *message, ...); // Misc startup/event functions diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 6bf78fb23a..a2e8acd257 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -24,7 +24,7 @@ #include "scumm.h" #include "actor.h" #include "bundle.h" -#include "debug.h" +#include "debugger.h" #include "dialogs.h" #include "imuse.h" #include "object.h" @@ -1002,11 +1002,6 @@ void Scumm::saveloadDialog() runDialog(_saveLoadDialog); } -void Scumm::debuggerDialog() -{ - g_debugger.attach(this); -} - void Scumm::optionsDialog() { if (!_optionsDialog) @@ -1136,7 +1131,7 @@ void Scumm::processKbd() _vars[VAR_CHARINC] = _defaultTalkDelay / 20; } else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console - debuggerDialog(); + g_debugger.attach(this); } _mouseButStat = _lastKeyHit; |