diff options
| author | Travis Howell | 2006-10-23 05:58:53 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-10-23 05:58:53 +0000 |
| commit | 80048e232787d247381ba718e68ca3aa7e5200cd (patch) | |
| tree | a72d393c41997e5ddc1d5a70d5c070aa4f9277eb /engines/agos/icons.cpp | |
| parent | 45965e35766bf2ede011e0f0775754363699937f (diff) | |
| download | scummvm-rg350-80048e232787d247381ba718e68ca3aa7e5200cd.tar.gz scummvm-rg350-80048e232787d247381ba718e68ca3aa7e5200cd.tar.bz2 scummvm-rg350-80048e232787d247381ba718e68ca3aa7e5200cd.zip | |
Add hasIcon difference in Elvira 1
svn-id: r24468
Diffstat (limited to 'engines/agos/icons.cpp')
| -rw-r--r-- | engines/agos/icons.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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) { /* |