From 80048e232787d247381ba718e68ca3aa7e5200cd Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 23 Oct 2006 05:58:53 +0000
Subject: Add hasIcon difference in Elvira 1

svn-id: r24468
---
 engines/agos/icons.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/agos/icons.cpp')

diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index b2926d4856..ae778072c6 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -288,7 +288,7 @@ void AGOSEngine::drawIconArray_Simon(uint num, Item *itemRef, int line, int clas
 	while (itemRef && line-- != 0) {
 		curWidth = 0;
 		while (itemRef && width > curWidth) {
-			if ((classMask == 0 || itemRef->classFlags & classMask) && has_item_childflag_0x10(itemRef))
+			if ((classMask == 0 || itemRef->classFlags & classMask) && hasIcon(itemRef))
 				curWidth += iconSize;
 			itemRef = derefItem(itemRef->next);
 		}
@@ -306,7 +306,7 @@ void AGOSEngine::drawIconArray_Simon(uint num, Item *itemRef, int line, int clas
 	showArrows = false;
 
 	while (itemRef) {
-		if ((classMask == 0 || itemRef->classFlags & classMask) && has_item_childflag_0x10(itemRef)) {
+		if ((classMask == 0 || itemRef->classFlags & classMask) && hasIcon(itemRef)) {
 			if (item_again == false) {
 				window->iconPtr->iconArray[k].item = itemRef;
 				if (getGameType() == GType_SIMON2) {
@@ -389,7 +389,7 @@ void AGOSEngine::drawIconArray_FF(uint num, Item *itemRef, int line, int classMa
 		uint16 ct = xp;
 		while (itemRef && ct < iconperline) {
 			if ((classMask == 0) || ((itemRef->classFlags & classMask) != 0)) {
-				if (has_item_childflag_0x10(itemRef)) {
+				if (hasIcon(itemRef)) {
 					ct += 45;
 					k++;
 				}
@@ -410,7 +410,7 @@ void AGOSEngine::drawIconArray_FF(uint num, Item *itemRef, int line, int classMa
 	while (itemRef) {
 		if ((classMask != 0) && ((itemRef->classFlags & classMask) == 0))
 			goto l1;
-		if (has_item_childflag_0x10(itemRef) == 0)
+		if (hasIcon(itemRef) == 0)
 			goto l1;
 		if (!idone) {
 /*
-- 
cgit v1.2.3