[Scummvm-cvs-logs] SF.net SVN: scummvm: [32209] scummvm/trunk/engines/gob/game_v2.cpp

[drmccoy at users.sourceforge.net]

Revision: 32209
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32209&view=rev
Author:   drmccoy
Date:     2008-05-21 22:02:39 -0700 (Wed, 21 May 2008)

Log Message:
-----------
Fixing the menu glitch in Woodruff

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game_v2.cpp

Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp	2008-05-21 18:52:27 UTC (rev 32208)
+++ scummvm/trunk/engines/gob/game_v2.cpp	2008-05-22 05:02:39 UTC (rev 32209)
@@ -632,13 +632,15 @@
 	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 @@
 							continue;
 
 						_activeCollResId = collPtr->id;
-						_activeCollIndex = i;
+						_activeCollIndex = i + collAreaStart;
 						_vm->_inter->storeMouse();
 						if (VAR(16) != 0)
 							break;
@@ -1006,7 +1008,7 @@
 							if ((collPtr->id & 0xF000) == 0x8000)
 								if (++counter == descIndex) {
 									_activeCollResId = collPtr->id;
-									_activeCollIndex = i;
+									_activeCollIndex = i + collAreaStart;
 									break;
 								}
 						}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.