[Scummvm-cvs-logs] SF.net SVN: scummvm: [21825] scummvm/trunk/engines/cine/object.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 21825
Author:   eriktorbjorn
Date:     2006-04-12 04:27:45 -0700 (Wed, 12 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21825&view=rev

Log Message:
-----------
Fixed serious bug in removeOverlayElement() that would cause it to fail. This
caused getObjectUnderCursor() select the wrong object because the object list
was no longer guaranteed to be sorted on priority ("mask").

In Future Wars, this made it difficult (impossible?) to pick up the tunic,
because the game would pick the bushes instead, even though the tunic had a
higher priority.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/object.cpp
Modified: scummvm/trunk/engines/cine/object.cpp
===================================================================
--- scummvm/trunk/engines/cine/object.cpp	2006-04-12 10:01:41 UTC (rev 21824)
+++ scummvm/trunk/engines/cine/object.cpp	2006-04-12 11:27:45 UTC (rev 21825)
@@ -105,7 +105,7 @@
 
 	currentHeadPtr = tempHead->next;
 
-	while (currentHeadPtr && (objIdx == currentHeadPtr->objIdx || param == currentHeadPtr->type)) {
+	while (currentHeadPtr && (objIdx != currentHeadPtr->objIdx || param != currentHeadPtr->type)) {
 		tempHead = currentHeadPtr;
 		currentHeadPtr = tempHead->next;
 	}


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