aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2006-06-22 13:04:19 +0000
committerTravis Howell2006-06-22 13:04:19 +0000
commit70b5453731facd8699c73db40445502f6e980eac (patch)
tree43f0c76ab4ea2eeb7b9adc1017c787613a9a80f1 /engines/scumm
parent59c296075aed24d755fdfc60a37fe95302250909 (diff)
downloadscummvm-rg350-70b5453731facd8699c73db40445502f6e980eac.tar.gz
scummvm-rg350-70b5453731facd8699c73db40445502f6e980eac.tar.bz2
scummvm-rg350-70b5453731facd8699c73db40445502f6e980eac.zip
Fix bug #1509496 - INDY3 (MAC): Map screen hangs up at azores.
svn-id: r23259
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/scumm.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 5d1d85f618..32dcb5c946 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1606,12 +1606,13 @@ int ScummEngine::scummLoop(int delta) {
((ScummEngine_v90he *)this)->_logicHE->startOfFrame();
}
#endif
- if (_game.version > 2) {
+ if (_game.version >= 3) {
VAR(VAR_TMR_1) += delta;
VAR(VAR_TMR_2) += delta;
VAR(VAR_TMR_3) += delta;
- if (_game.id == GID_ZAK || _game.id == GID_INDY3) {
- // All versions of Indy3 set three extra timers
+ if ((_game.id == GID_INDY3 && _game.platform != Common::kPlatformMacintosh) ||
+ _game.id == GID_ZAK) {
+ // Amiga/PC versions of Indy3 set three extra timers
// FM-TOWNS version of Zak sets three extra timers
VAR(39) += delta;
VAR(40) += delta;