aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
authorMax Horn2002-12-14 14:31:44 +0000
committerMax Horn2002-12-14 14:31:44 +0000
commitb9b8045e1fa7a1f26574637e835bd842246908aa (patch)
tree39cd17bf239e79aba5cd412deb91cd496dc71cd2 /scumm/scummvm.cpp
parent96131f865ca4df12615cf01b547b93209d242899 (diff)
downloadscummvm-rg350-b9b8045e1fa7a1f26574637e835bd842246908aa.tar.gz
scummvm-rg350-b9b8045e1fa7a1f26574637e835bd842246908aa.tar.bz2
scummvm-rg350-b9b8045e1fa7a1f26574637e835bd842246908aa.zip
moved the console code to gui/console.cpp; make it actually printout something. Note that this is WORK IN PROGRESS! I know it is incomplete, no need to tell me that
svn-id: r5952
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp5
1 files changed, 3 insertions, 2 deletions
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();
}