aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/items.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/agos/items.cpp')
-rw-r--r--engines/agos/items.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index b0ebabe0ae..6d5e869038 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.cpp
@@ -60,6 +60,15 @@ void AGOSEngine::allocItemHeap() {
error("Out Of Memory - Items");
}
+bool AGOSEngine::hasIcon(Item *item) {
+ if (getGameType() == GType_ELVIRA1) {
+ return (getUserFlag(item, 7) != 0);
+ } else {
+ SubObject *child = (SubObject *)findChildOfType(item, 2);
+ return (child && (child->objectFlags & kOFIcon) != 0);
+ }
+}
+
uint AGOSEngine::itemGetIconNumber(Item *item) {
if (getGameType() == GType_ELVIRA1) {
return getUserFlag(item, 7);
@@ -341,11 +350,6 @@ void AGOSEngine::linkItem(Item *item, Item *parent) {
}
}
-bool AGOSEngine::has_item_childflag_0x10(Item *item) {
- SubObject *child = (SubObject *)findChildOfType(item, 2);
- return child && (child->objectFlags & kOFIcon) != 0;
-}
-
int AGOSEngine::wordMatch(Item *item, int16 a, int16 n) {
if ((a == -1) && (n == item->noun))
return 1;