aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2010-06-20 09:51:11 +0000
committerTorbjörn Andersson2010-06-20 09:51:11 +0000
commit41990883bf003ff075821bc484b605b1ba87c8ad (patch)
tree7c47340ed0d27b54a7e79a3ad28260aecec9227c
parent110e03c87b65330ef1ac105ddfca55bb1ac1d4ac (diff)
downloadscummvm-rg350-41990883bf003ff075821bc484b605b1ba87c8ad.tar.gz
scummvm-rg350-41990883bf003ff075821bc484b605b1ba87c8ad.tar.bz2
scummvm-rg350-41990883bf003ff075821bc484b605b1ba87c8ad.zip
Don't go into "menu input mode" unless the game currently allows the menus to
be displayed. I hope this is the correct fix to keep Police Quest 1 from hanging if you press Escape while reading the newspaper in the briefing room. svn-id: r50072
-rw-r--r--engines/agi/cycle.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index ee55c783f1..c185c3efb3 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -178,6 +178,9 @@ void AgiEngine::updateTimer() {
}
void AgiEngine::newInputMode(InputMode mode) {
+ if (mode == INPUT_MENU && !getflag(fMenusWork) && !(getFeatures() & GF_MENUS))
+ return;
+
_oldMode = _game.inputMode;
_game.inputMode = mode;
}