aboutsummaryrefslogtreecommitdiff
path: root/engines/cine/main_loop.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-11-19 18:54:06 +0000
committerTorbjörn Andersson2006-11-19 18:54:06 +0000
commit50e2cf9caa0d6568ac0eac2ffb1cb0f637c13220 (patch)
treeaee9d5a017b346eed49a8d4cc2ae1a693c51df57 /engines/cine/main_loop.cpp
parent39b27ed3bb3f8d54d988afd6de147ede518ca4bd (diff)
downloadscummvm-rg350-50e2cf9caa0d6568ac0eac2ffb1cb0f637c13220.tar.gz
scummvm-rg350-50e2cf9caa0d6568ac0eac2ffb1cb0f637c13220.tar.bz2
scummvm-rg350-50e2cf9caa0d6568ac0eac2ffb1cb0f637c13220.zip
Don't allow the F9 and F10 keys to open menus if a menu is already open. (Might
need more testing.) svn-id: r24747
Diffstat (limited to 'engines/cine/main_loop.cpp')
-rw-r--r--engines/cine/main_loop.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp
index 6b53012171..f07db1c6c3 100644
--- a/engines/cine/main_loop.cpp
+++ b/engines/cine/main_loop.cpp
@@ -113,13 +113,13 @@ void manageEvents(int count) {
}
break;
case 290: // F9
- if (allowPlayerInput) {
+ if (allowPlayerInput && !inMenu) {
makeActionMenu();
makeCommandLine();
}
break;
case 291: // F10
- if (allowPlayerInput) {
+ if (allowPlayerInput && !inMenu) {
g_cine->makeSystemMenu();
}
break;
@@ -207,6 +207,7 @@ void mainLoop(int bootScriptIdx) {
gfxFuncGen2();
quitFlag = 0;
+ inMenu = false;
allowPlayerInput = 0;
checkForPendingDataLoadSwitch = 0;