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

[peres001 at users.sourceforge.net]

Revision: 25676
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25676&view=rev
Author:   peres001
Date:     2007-02-18 01:36:47 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
enforced use of MAKE_INVENTORY_ID

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

Modified: scummvm/trunk/engines/parallaction/inventory.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.cpp	2007-02-18 09:35:50 UTC (rev 25675)
+++ scummvm/trunk/engines/parallaction/inventory.cpp	2007-02-18 09:36:47 UTC (rev 25676)
@@ -122,7 +122,7 @@
 	if (_si == INVENTORY_MAX_ITEMS)
 		return -1;
 
-	_inventory[_si]._id = (z->u.get->_icon << 16) & 0xFFFF0000;
+	_inventory[_si]._id = MAKE_INVENTORY_ID(z->u.get->_icon);
 	_inventory[_si]._index = z->u.get->_icon;
 
 	addJob(jobRemovePickedItem, z, kPriority17 );
@@ -140,7 +140,7 @@
 	uint16 _si = 0;
 	while (_inventory[_si]._id != 0) _si++;
 
-	_inventory[_si]._id = (item << 16) & 0xFFFF0000;
+	_inventory[_si]._id = MAKE_INVENTORY_ID(item);
 	_inventory[_si]._index = item;
 
 	refreshInventoryItem(_vm->_characterName, _si);


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