diff options
| author | athrxx | 2011-08-07 22:14:10 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:14 +0100 |
| commit | 359f3efd03704965d258c90381412a5ef2cf9239 (patch) | |
| tree | e74ab719fd0b5825336f93737a1dc1afb65ebdcb /engines/kyra/items_eob.cpp | |
| parent | fc5b29fdbcf4170436a32da2c1f4b078b1f1f90f (diff) | |
| download | scummvm-rg350-359f3efd03704965d258c90381412a5ef2cf9239.tar.gz scummvm-rg350-359f3efd03704965d258c90381412a5ef2cf9239.tar.bz2 scummvm-rg350-359f3efd03704965d258c90381412a5ef2cf9239.zip | |
KYRA: (EOB) - add some spells
(shocking grasp, flame blade, vampiric touch etc.)
Diffstat (limited to 'engines/kyra/items_eob.cpp')
| -rw-r--r-- | engines/kyra/items_eob.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp index e2d28703a8..a83207b565 100644 --- a/engines/kyra/items_eob.cpp +++ b/engines/kyra/items_eob.cpp @@ -208,7 +208,7 @@ int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl int itm = _characters[charIndex].inventory[slot]; int ex = _itemTypes[_items[itm].type].extraProperties & 0x7f; - if (slot < 2 && _items[itm].flags & 0x20 && ex > 0 && ex < 4) { + if (slot < 2 && (_items[itm].flags & 0x20) && ex > 0 && ex < 4) { if (_flags.gameID == GI_EOB2) _txt->printMessage(_validateCursedString[0], -1, _characters[charIndex].name); return 0; @@ -474,8 +474,8 @@ void EobCoreEngine::drawItemIconShape(int pageNum, Item itemId, int x, int y) { } } -bool EobCoreEngine::isMagicWeapon(Item itemIndex) { - return (_items[itemIndex].type > 10 && _items[itemIndex].type < 18); +bool EobCoreEngine::isMagicEffectItem(Item itemIndex) { + return (itemIndex > 10 && itemIndex < 18); } bool EobCoreEngine::checkInventoryForRings(int charIndex, int itemValue) { |