thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing the menu glitch in Woodruff

Browse source 
svn-id: r32209
This commit is contained in:
Sven Hesse 2008-05-22 05:02:39 +00:00
parent 4074d49844
commit abe87559bc
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/gob/game_v2.cpp
View file

@ -632,13 +632,15 @@ void Game_v2::collisionsBlock(void) {
Collision *collArea; Collision *collArea;
int16 timeKey; int16 timeKey;
byte *savedIP; byte *savedIP;
byte collAreaStart;
if (_shouldPushColls) if (_shouldPushColls)
pushCollisions(0); pushCollisions(0);
collArea = _collisionAreas; collAreaStart = 0;
while (collArea->left != 0xFFFF) while (_collisionAreas[collAreaStart].left != 0xFFFF)
collArea++; collAreaStart++;
collArea = &_collisionAreas[collAreaStart];
_shouldPushColls = 0; _shouldPushColls = 0;
collResId = -1; collResId = -1;
@ -964,7 +966,7 @@ void Game_v2::collisionsBlock(void) {
continue; continue;
_activeCollResId = collPtr->id; _activeCollResId = collPtr->id;
_activeCollIndex = i; _activeCollIndex = i + collAreaStart;
_vm->_inter->storeMouse(); _vm->_inter->storeMouse();
if (VAR(16) != 0) if (VAR(16) != 0)
break; break;
@ -1006,7 +1008,7 @@ void Game_v2::collisionsBlock(void) {
if ((collPtr->id & 0xF000) == 0x8000) if ((collPtr->id & 0xF000) == 0x8000)
if (++counter == descIndex) { if (++counter == descIndex) {
_activeCollResId = collPtr->id; _activeCollResId = collPtr->id;
_activeCollIndex = i; _activeCollIndex = i + collAreaStart;
break; break;
} }
} }