aboutsummaryrefslogtreecommitdiff
path: root/sword1
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-07-16 06:57:47 +0000
committerTorbjörn Andersson2004-07-16 06:57:47 +0000
commit613642efd01b0c4bbbdc167cc85abdc5e4fde549 (patch)
treeb8807b039c5e22d9ed5bfffe0439b19888fc1e11 /sword1
parentbd8c7f08f626eb75b5eb3d20769b3de2a3aeda43 (diff)
downloadscummvm-rg350-613642efd01b0c4bbbdc167cc85abdc5e4fde549.tar.gz
scummvm-rg350-613642efd01b0c4bbbdc167cc85abdc5e4fde549.tar.bz2
scummvm-rg350-613642efd01b0c4bbbdc167cc85abdc5e4fde549.zip
Open the control panel on both F5 and ESC, like the original did.
svn-id: r14222
Diffstat (limited to 'sword1')
-rw-r--r--sword1/sword1.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp
index b29ad6f09b..0981dbce21 100644
--- a/sword1/sword1.cpp
+++ b/sword1/sword1.cpp
@@ -1196,7 +1196,10 @@ uint8 SwordEngine::mainLoop(void) {
if (_systemVars.forceRestart)
retCode = CONTROL_RESTART_GAME;
- else if (((_keyPressed == 63) && (Logic::_scriptVars[MOUSE_STATUS] & 1)) || (_systemVars.deathScreenFlag)) {
+
+ // The control panel is triggered by F5 or ESC.
+ // FIXME: This is a very strange way of detecting F5...
+ else if (((_keyPressed == 63 || _keyPressed == 27) && (Logic::_scriptVars[MOUSE_STATUS] & 1)) || (_systemVars.deathScreenFlag)) {
retCode = _control->runPanel();
if (!retCode)
_screen->fullRefresh();