diff options
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/dialogs.cpp | 46 | ||||
-rw-r--r-- | scumm/dialogs.h | 11 | ||||
-rw-r--r-- | scumm/scummvm.cpp | 5 |
3 files changed, 3 insertions, 59 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index 16b8cc21ba..c115295ca1 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -670,52 +670,6 @@ PauseDialog::PauseDialog(NewGui *gui, Scumm *scumm) { } -#pragma mark - - -DebuggerDialog::DebuggerDialog(NewGui *gui, Scumm *scumm, int width, int height) - : ScummDialog(gui, scumm, 0, 0, width, height) -{ - draw(); -} - -void DebuggerDialog::drawDialog() -{ - //int history_len = cmd_history.size(); - - // Draw box and border - _gui->blendRect(_x, _y, _w, _h, _gui->_bgcolor); - /*_gui->line(_x, _y, _x, _h, _gui->_color); - _gui->line(_w, _y, _w, _y, _gui->_color); - _gui->line(_x, _h, _w, _h, _gui->_shadowcolor);*/ - - _gui->addDirtyRect(_x, _y, _w, _h); - - // Draw items - // ... history_len - ((_h / kLineHeight) * _page) -} - -void DebuggerDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { - if ((ascii == '~') || (keycode == 27)) { // Total abort on tilde or escape - close(); - return; - } else if (ascii == '\r' || ascii == '\n') { // Run command on enter/newline - // TODO: Add some kind of pop() method to StringList, - // so we can remove old obsolete entries and not waste memory - cmd_history.push_back(cmd_current); - // _scumm.debugger.parseCommand(cmd_current, (void*)this.printCallback); - cmd_current.clear(); - draw(); - } else if (keycode == 8) { // Backspace - cmd_current.deleteLastChar(); - draw(); - } else if ((keycode >= 31) && (keycode <= 122)) { // Printable ASCII, add to string - cmd_current+=(char)ascii; - draw(); - } else { - debug(2, "Unhandled keycode from DebuggerDialog: %d\n", keycode); - } -} - #ifdef _WIN32_WCE #pragma mark - diff --git a/scumm/dialogs.h b/scumm/dialogs.h index 4a0f27b22b..abe21082d2 100644 --- a/scumm/dialogs.h +++ b/scumm/dialogs.h @@ -134,17 +134,6 @@ public: PauseDialog(NewGui *gui, Scumm *scumm); }; -class DebuggerDialog : public ScummDialog { -protected: - ScummVM::StringList cmd_history; - String cmd_current; - -public: - DebuggerDialog(NewGui *gui, Scumm *scumm, int width, int height); - virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers); - virtual void drawDialog(); -}; - #ifdef _WIN32_WCE class KeysDialog : public ScummDialog { diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 7b77c9a176..b9d7e19e66 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -34,6 +34,7 @@ #include "verbs.h" #include "common/gameDetector.h" #include "common/config-file.h" +#include "gui/console.h" #include "gui/newgui.h" #include "gui/message.h" #include "sound/mixer.h" @@ -1003,7 +1004,7 @@ void Scumm::saveloadDialog() void Scumm::debuggerDialog() { if (!_debuggerDialog) - _debuggerDialog = new DebuggerDialog(_newgui, this, _realWidth, _realHeight / 5); + _debuggerDialog = new ConsoleDialog(_newgui); runDialog(_debuggerDialog); } @@ -1135,7 +1136,7 @@ void Scumm::processKbd() _defaultTalkDelay = 5; _vars[VAR_CHARINC] = _defaultTalkDelay / 20; - } else if (_lastKeyHit == '~') { // Debug console + } else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console debuggerDialog(); } |