aboutsummaryrefslogtreecommitdiff
path: root/engines/agi/cycle.cpp
diff options
context:
space:
mode:
authorMartin Kiewitz2016-02-18 02:01:51 +0100
committerMartin Kiewitz2016-02-18 02:01:51 +0100
commit4d85aa193c5d9df2a8ee6352b885b6c9be8d1b76 (patch)
treede95b76ed64ef9b1405738283f3a74ffdf9c7c0a /engines/agi/cycle.cpp
parent736d7cd533255d1fa9b3a6d20158ed7c917ac4a6 (diff)
downloadscummvm-rg350-4d85aa193c5d9df2a8ee6352b885b6c9be8d1b76.tar.gz
scummvm-rg350-4d85aa193c5d9df2a8ee6352b885b6c9be8d1b76.tar.bz2
scummvm-rg350-4d85aa193c5d9df2a8ee6352b885b6c9be8d1b76.zip
AGI: Apple IIgs time delay override KQ4 completed
Diffstat (limited to 'engines/agi/cycle.cpp')
-rw-r--r--engines/agi/cycle.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index 9b7dc63df8..f253804da3 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -379,6 +379,13 @@ int AgiEngine::playGame() {
appleIIgsDelayRoomOverwrite = appleIIgsDelayOverwrite->roomTable;
while (appleIIgsDelayRoomOverwrite->fromRoom >= 0) {
if ((appleIIgsDelayRoomOverwrite->fromRoom <= curRoom) && (appleIIgsDelayRoomOverwrite->toRoom >= curRoom)) {
+ if (appleIIgsDelayRoomOverwrite->onlyWhenPlayerNotInControl) {
+ if (_game.playerControl) {
+ // Player is actually currently in control? -> then skip this entry
+ appleIIgsDelayRoomOverwrite++;
+ continue;
+ }
+ }
timeDelayOverwrite = appleIIgsDelayRoomOverwrite->timeDelayOverwrite;
break;
}