diff options
| author | Max Horn | 2007-06-30 16:25:59 +0000 |
|---|---|---|
| committer | Max Horn | 2007-06-30 16:25:59 +0000 |
| commit | 206d167457efe684478a7947535a9c58b790e31d (patch) | |
| tree | 16d2832c1de2c9c7f68ef622af247d57ed931a1e /engines/agos/script.cpp | |
| parent | 21624d3eb7514f8ca8a21a7567d34a8621800f70 (diff) | |
| download | scummvm-rg350-206d167457efe684478a7947535a9c58b790e31d.tar.gz scummvm-rg350-206d167457efe684478a7947535a9c58b790e31d.tar.bz2 scummvm-rg350-206d167457efe684478a7947535a9c58b790e31d.zip | |
AGOS: Introduced ChildType enum
svn-id: r27792
Diffstat (limited to 'engines/agos/script.cpp')
| -rw-r--r-- | engines/agos/script.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index c5cf6c5872..bb7faa91d3 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -206,7 +206,7 @@ void AGOSEngine::o_state() { void AGOSEngine::o_oflag() { // 28: item has prop - SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2); + SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), kObjectType); uint num = getVarOrByte(); setScriptCondition(subObject != NULL && (subObject->objectFlags & (1 << num)) != 0); } @@ -326,7 +326,7 @@ void AGOSEngine::o_goto() { void AGOSEngine::o_oset() { // 56: set child2 fr bit - SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2); + SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), kObjectType); int value = getVarOrByte(); if (subObject != NULL && value >= 16) subObject->objectFlags |= (1 << value); @@ -334,7 +334,7 @@ void AGOSEngine::o_oset() { void AGOSEngine::o_oclear() { // 57: clear child2 fr bit - SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2); + SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), kObjectType); int value = getVarOrByte(); if (subObject != NULL && value >= 16) subObject->objectFlags &= ~(1 << value); @@ -426,7 +426,7 @@ void AGOSEngine::o_if2() { void AGOSEngine::o_isCalled() { // 79: childstruct fr2 is - SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2); + SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), kObjectType); uint stringId = getNextStringID(); setScriptCondition((subObject != NULL) && subObject->objectName == stringId); } @@ -985,10 +985,10 @@ Child *nextSub(Child *sub, int16 key) { } void AGOSEngine::synchChain(Item *i) { - SubChain *c = (SubChain *)findChildOfType(i, 8); + SubChain *c = (SubChain *)findChildOfType(i, kChainType); while (c) { setItemState(derefItem(c->chChained), i->state); - c = (SubChain *)nextSub((Child *)c, 8); + c = (SubChain *)nextSub((Child *)c, kChainType); } } |