diff options
Diffstat (limited to 'engines/agos/items.cpp')
| -rw-r--r-- | engines/agos/items.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp index fed323e70e..b7ba729a0d 100644 --- a/engines/agos/items.cpp +++ b/engines/agos/items.cpp @@ -53,28 +53,28 @@ void AGOSEngine::allocItemHeap() { _itemHeap.clear(); } +bool AGOSEngine_Elvira2::hasIcon(Item *item) { + SubObject *child = (SubObject *)findChildOfType(item, kObjectType); + return (child && (child->objectFlags & kOFIcon) != 0); +} + bool AGOSEngine::hasIcon(Item *item) { - if (getGameType() == GType_ELVIRA1) { - return (getUserFlag(item, 7) != 0); - } else { - SubObject *child = (SubObject *)findChildOfType(item, kObjectType); - return (child && (child->objectFlags & kOFIcon) != 0); - } + return (getUserFlag(item, 7) != 0); } -uint AGOSEngine::itemGetIconNumber(Item *item) { - if (getGameType() == GType_ELVIRA1) { - return getUserFlag(item, 7); - } else { - SubObject *child = (SubObject *)findChildOfType(item, kObjectType); - uint offs; +uint AGOSEngine_Elvira2::itemGetIconNumber(Item *item) { + SubObject *child = (SubObject *)findChildOfType(item, kObjectType); + uint offs; - if (child == NULL || !(child->objectFlags & kOFIcon)) - return 0; + if (child == NULL || !(child->objectFlags & kOFIcon)) + return 0; - offs = getOffsetOfChild2Param(child, 0x10); - return child->objectFlagValue[offs]; - } + offs = getOffsetOfChild2Param(child, 0x10); + return child->objectFlagValue[offs]; +} + +uint AGOSEngine::itemGetIconNumber(Item *item) { + return getUserFlag(item, 7); } void AGOSEngine::setItemState(Item *item, int value) { |