[Scummvm-cvs-logs] SF.net SVN: scummvm: [25714] scummvm/trunk/engines/parallaction/zone.cpp

[peres001 at users.sourceforge.net]

Revision: 25714
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25714&view=rev
Author:   peres001
Date:     2007-02-19 01:25:11 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
fixed regression bug preventing user from interacting with many items, notably not allowing combining items from the inventory

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/zone.cpp

Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp	2007-02-19 08:48:54 UTC (rev 25713)
+++ scummvm/trunk/engines/parallaction/zone.cpp	2007-02-19 09:25:11 UTC (rev 25714)
@@ -633,8 +633,8 @@
 				// WORKAROUND: this huge condition is needed because we made ZoneTypeData a collection of structs
 				// instead of an union. So, merge->_obj1 and get->_icon were just aliases in the original engine,
 				// but we need to check it separately here. The same workaround is applied in freeZones.
-				if ((((z->_type & 0xFFFF0000) == kZoneMerge) && (((_si == z->u.merge->_obj1) && (_di == z->u.merge->_obj2)) || ((_si == z->u.merge->_obj2) && (_di == z->u.merge->_obj1)))) ||
-					(((z->_type & 0xFFFF0000) == kZoneGet) && ((_si == z->u.get->_icon) || (_di == z->u.get->_icon)))) {
+				if ((((z->_type & 0xFFFF) == kZoneMerge) && (((_si == z->u.merge->_obj1) && (_di == z->u.merge->_obj2)) || ((_si == z->u.merge->_obj2) && (_di == z->u.merge->_obj1)))) ||
+					(((z->_type & 0xFFFF) == kZoneGet) && ((_si == z->u.get->_icon) || (_di == z->u.get->_icon)))) {
 
 					// special Zone
 					if ((type == 0) && ((z->_type & 0xFFFF0000) == 0))


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