diff options
| author | Travis Howell | 2006-11-06 01:14:26 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-11-06 01:14:26 +0000 |
| commit | a1a5c9b38a6d5cdd4dbed026cc6ea6b17234243c (patch) | |
| tree | 86106b078b22b305dbae856940d61f928b880dcf /engines/agos/script.cpp | |
| parent | 3ebba5fab9b549d97443ebc058613892e7b15583 (diff) | |
| download | scummvm-rg350-a1a5c9b38a6d5cdd4dbed026cc6ea6b17234243c.tar.gz scummvm-rg350-a1a5c9b38a6d5cdd4dbed026cc6ea6b17234243c.tar.bz2 scummvm-rg350-a1a5c9b38a6d5cdd4dbed026cc6ea6b17234243c.zip | |
The clear timers script only exists in Simon1
svn-id: r24630
Diffstat (limited to 'engines/agos/script.cpp')
| -rw-r--r-- | engines/agos/script.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index f1b87d6508..3f7b99f96b 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -460,7 +460,7 @@ void AGOSEngine::o_oset() { // 56: set child2 fr bit SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2); int value = getVarOrByte(); - if (subObject != NULL && value >= 0x10) + if (subObject != NULL && value >= 16) subObject->objectFlags |= (1 << value); } @@ -468,7 +468,7 @@ void AGOSEngine::o_oclear() { // 57: clear child2 fr bit SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2); int value = getVarOrByte(); - if (subObject != NULL && value >= 0x10) + if (subObject != NULL && value >= 16) subObject->objectFlags &= ~(1 << value); } @@ -927,7 +927,7 @@ void AGOSEngine::o_clearTimers() { // 140: clear timers killAllTimers(); - if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) + if (getGameType() == GType_SIMON1) addTimeEvent(3, 160); } |