diff options
| author | Paul Gilbert | 2015-05-19 08:13:46 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-19 08:13:46 -0400 |
| commit | 1c395b4de91f3edb0ad7109da016eb42a32b434b (patch) | |
| tree | 3111d1c46227c5cfc7fa0db7084c46ebceb98e8e /engines/sherlock/objects.cpp | |
| parent | fa35249a240d7bdfe5f5b7eb9ae073126d5080c4 (diff) | |
| download | scummvm-rg350-1c395b4de91f3edb0ad7109da016eb42a32b434b.tar.gz scummvm-rg350-1c395b4de91f3edb0ad7109da016eb42a32b434b.tar.bz2 scummvm-rg350-1c395b4de91f3edb0ad7109da016eb42a32b434b.zip | |
SHERLOCK: Add extra constants for object bit-flags
Diffstat (limited to 'engines/sherlock/objects.cpp')
| -rw-r--r-- | engines/sherlock/objects.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index e630b48f3a..94457b3dd5 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -575,7 +575,7 @@ void Object::checkObject() { _seqCounter2 = _seqCounter; _seqStack = _frameNumber + 1; setObjSequence(v, false); - } else if (v >= SOUND_CODE && (v <= (SOUND_CODE + 29))) { + } else if (v >= SOUND_CODE && (v < (SOUND_CODE + 30))) { codeFound = true; ++_frameNumber; v -= SOUND_CODE; @@ -584,7 +584,7 @@ void Object::checkObject() { if (!scene._sounds[v - 1]._name.empty() && sound._digitized) sound.playLoadedSound(v - 1, WAIT_RETURN_IMMEDIATELY); } - } else if (v >= FLIP_CODE && v <= (FLIP_CODE + 2)) { + } else if (v >= FLIP_CODE && v < (FLIP_CODE + 3)) { // Flip code codeFound = true; ++_frameNumber; @@ -594,15 +594,15 @@ void Object::checkObject() { switch (v) { case 0: // Clear the flag - _flags &= ~2; + _flags &= ~OBJ_FLIPPED; break; case 1: // Set the flag - _flags |= 2; + _flags |= OBJ_FLIPPED; break; case 2: // Toggle the flag - _flags ^= 2; + _flags ^= OBJ_FLIPPED; break; default: break; |