aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSven Hesse2008-05-22 05:02:39 +0000
committerSven Hesse2008-05-22 05:02:39 +0000
commitabe87559bc6e70376ccd4d0565a9976966d77a3f (patch)
tree8d52e5cb16190104684058e87b59b1edbf82f94c /engines
parent4074d49844d6851d377374f1d04d43fb9fdad6a8 (diff)
downloadscummvm-rg350-abe87559bc6e70376ccd4d0565a9976966d77a3f.tar.gz
scummvm-rg350-abe87559bc6e70376ccd4d0565a9976966d77a3f.tar.bz2
scummvm-rg350-abe87559bc6e70376ccd4d0565a9976966d77a3f.zip
Fixing the menu glitch in Woodruff
svn-id: r32209
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/game_v2.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp
index ff444f4a69..e783f5bfb5 100644
--- a/engines/gob/game_v2.cpp
+++ b/engines/gob/game_v2.cpp
@@ -632,13 +632,15 @@ void Game_v2::collisionsBlock(void) {
Collision *collArea;
int16 timeKey;
byte *savedIP;
+ byte collAreaStart;
if (_shouldPushColls)
pushCollisions(0);
- collArea = _collisionAreas;
- while (collArea->left != 0xFFFF)
- collArea++;
+ collAreaStart = 0;
+ while (_collisionAreas[collAreaStart].left != 0xFFFF)
+ collAreaStart++;
+ collArea = &_collisionAreas[collAreaStart];
_shouldPushColls = 0;
collResId = -1;
@@ -964,7 +966,7 @@ void Game_v2::collisionsBlock(void) {
continue;
_activeCollResId = collPtr->id;
- _activeCollIndex = i;
+ _activeCollIndex = i + collAreaStart;
_vm->_inter->storeMouse();
if (VAR(16) != 0)
break;
@@ -1006,7 +1008,7 @@ void Game_v2::collisionsBlock(void) {
if ((collPtr->id & 0xF000) == 0x8000)
if (++counter == descIndex) {
_activeCollResId = collPtr->id;
- _activeCollIndex = i;
+ _activeCollIndex = i + collAreaStart;
break;
}
}