libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-02 16:31:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add hasIcon difference in Elvira 1

Browse Source 
svn-id: r24468
This commit is contained in:
Travis Howell 2006-10-23 05:58:53 +00:00
parent 45965e3576
commit 80048e2327
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/agos/agos.cpp
View File

@ -682,7 +682,7 @@ void AGOSEngine::setupGame() {
_vgaMemSize = gVars->memory[kMemSimon1Games]; _vgaMemSize = gVars->memory[kMemSimon1Games];
#endif #endif
_itemMemSize = 64000; _itemMemSize = 64000;
_tableMemSize = 50000; _tableMemSize = 100000;
_frameRate = 4; _frameRate = 4;
_vgaBaseDelay = 1; _vgaBaseDelay = 1;
_numVars = 255; _numVars = 255;

2
engines/agos/agos.h
View File

@ -781,7 +781,7 @@ protected:
void removeArrows(WindowBlock *window, uint num); void removeArrows(WindowBlock *window, uint num);
void draw_icon_c(WindowBlock *window, uint icon, uint x, uint y); void draw_icon_c(WindowBlock *window, uint icon, uint x, uint y);
bool has_item_childflag_0x10(Item *item); bool hasIcon(Item *item);
uint itemGetIconNumber(Item *item); uint itemGetIconNumber(Item *item);
uint setupIconHitArea(WindowBlock *window, uint num, uint x, uint y, Item *item_ptr); uint setupIconHitArea(WindowBlock *window, uint num, uint x, uint y, Item *item_ptr);
void drawIconArray(uint i, Item *item_ptr, int line, int classMask); void drawIconArray(uint i, Item *item_ptr, int line, int classMask);

8
engines/agos/icons.cpp
View File

@ -288,7 +288,7 @@ void AGOSEngine::drawIconArray_Simon(uint num, Item *itemRef, int line, int clas
while (itemRef && line-- != 0) { while (itemRef && line-- != 0) {
curWidth = 0; curWidth = 0;
while (itemRef && width > curWidth) { 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; curWidth += iconSize;
itemRef = derefItem(itemRef->next); itemRef = derefItem(itemRef->next);
} }
@ -306,7 +306,7 @@ void AGOSEngine::drawIconArray_Simon(uint num, Item *itemRef, int line, int clas
showArrows = false; showArrows = false;
while (itemRef) { 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) { if (item_again == false) {
window->iconPtr->iconArray[k].item = itemRef; window->iconPtr->iconArray[k].item = itemRef;
if (getGameType() == GType_SIMON2) { if (getGameType() == GType_SIMON2) {
@ -389,7 +389,7 @@ void AGOSEngine::drawIconArray_FF(uint num, Item *itemRef, int line, int classMa
uint16 ct = xp; uint16 ct = xp;
while (itemRef && ct < iconperline) { while (itemRef && ct < iconperline) {
if ((classMask == 0) || ((itemRef->classFlags & classMask) != 0)) { if ((classMask == 0) || ((itemRef->classFlags & classMask) != 0)) {
if (has_item_childflag_0x10(itemRef)) { if (hasIcon(itemRef)) {
ct += 45; ct += 45;
k++; k++;
} }
@ -410,7 +410,7 @@ void AGOSEngine::drawIconArray_FF(uint num, Item *itemRef, int line, int classMa
while (itemRef) { while (itemRef) {
if ((classMask != 0) && ((itemRef->classFlags & classMask) == 0)) if ((classMask != 0) && ((itemRef->classFlags & classMask) == 0))
goto l1; goto l1;
if (has_item_childflag_0x10(itemRef) == 0) if (hasIcon(itemRef) == 0)
goto l1; goto l1;
if (!idone) { if (!idone) {
/* /*

14
engines/agos/items.cpp
View File

@ -60,6 +60,15 @@ void AGOSEngine::allocItemHeap() {
error("Out Of Memory - Items"); 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) { uint AGOSEngine::itemGetIconNumber(Item *item) {
if (getGameType() == GType_ELVIRA1) { if (getGameType() == GType_ELVIRA1) {
return getUserFlag(item, 7); 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) { int AGOSEngine::wordMatch(Item *item, int16 a, int16 n) {
if ((a == -1) && (n == item->noun)) if ((a == -1) && (n == item->noun))
return 1; return 1;