diff options
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/scumm.cpp | 20 | ||||
| -rw-r--r-- | engines/scumm/scumm.h | 2 |
2 files changed, 5 insertions, 17 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index d320bc55de..7da88fe5e6 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -63,10 +63,6 @@ #include "sound/mixer.h" -#ifdef _WIN32_WCE -extern bool isSmartphone(void); -#endif - #if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) namespace Graphics { extern void initfonts(); @@ -2117,6 +2113,9 @@ char ScummEngine::displayMessage(const char *altButton, const char *message, ... #pragma mark --- Miscellaneous --- #pragma mark - +GUI::Debugger *ScummEngine::getDebugger() { + return _debugger; +} void ScummEngine::errorString(const char *buf1, char *buf2) { if (_currentScript != 0xFF) { @@ -2126,19 +2125,6 @@ void ScummEngine::errorString(const char *buf1, char *buf2) { } else { strcpy(buf2, buf1); } - -#ifdef _WIN32_WCE - if (isSmartphone()) - return; -#endif - - // Unless an error -originated- within the debugger, spawn the debugger. Otherwise - // exit out normally. - if (_debugger && !_debugger->isAttached()) { - printf("%s\n", buf2); // (Print it again in case debugger segfaults) - _debugger->attach(buf2); - _debugger->onFrame(); - } } diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index d9ae984bda..36aa285a5a 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -417,7 +417,9 @@ class ScummEngine : public Engine { friend class CharsetRenderer; friend class ResourceManager; + GUI::Debugger *getDebugger(); void errorString(const char *buf_input, char *buf_output); + public: /* Put often used variables at the top. * That results in a shorter form of the opcode |