diff options
| author | Nicola Mettifogo | 2007-02-18 09:36:47 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-02-18 09:36:47 +0000 |
| commit | 6452e607278ce920f6ff669f779ad7915eac6aec (patch) | |
| tree | 62a725162e74bd6ba4fcfd734feea2c348318bcb /engines | |
| parent | d0da5666336d6a3062d1e64820f0ce00745d60be (diff) | |
| download | scummvm-rg350-6452e607278ce920f6ff669f779ad7915eac6aec.tar.gz scummvm-rg350-6452e607278ce920f6ff669f779ad7915eac6aec.tar.bz2 scummvm-rg350-6452e607278ce920f6ff669f779ad7915eac6aec.zip | |
enforced use of MAKE_INVENTORY_ID
svn-id: r25676
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/parallaction/inventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp index f654181046..c43f13e44b 100644 --- a/engines/parallaction/inventory.cpp +++ b/engines/parallaction/inventory.cpp @@ -122,7 +122,7 @@ int16 pickupItem(Zone *z) { 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 @@ void addInventoryItem(uint16 item) { 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); |