diff options
| author | Paul Gilbert | 2015-05-18 23:44:59 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-18 23:44:59 -0400 |
| commit | 7c3ac25ac153a2934ee94c8aa83b72843bd56351 (patch) | |
| tree | e75dbb45ee1c81be4015df8110b797eb65531db9 /engines/sherlock/objects.cpp | |
| parent | a09937121c3844071ab992115f32b47d57a5d337 (diff) | |
| download | scummvm-rg350-7c3ac25ac153a2934ee94c8aa83b72843bd56351.tar.gz scummvm-rg350-7c3ac25ac153a2934ee94c8aa83b72843bd56351.tar.bz2 scummvm-rg350-7c3ac25ac153a2934ee94c8aa83b72843bd56351.zip | |
SHERLOCK: Further syntactic fixes
Diffstat (limited to 'engines/sherlock/objects.cpp')
| -rw-r--r-- | engines/sherlock/objects.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index 310afbf94b..eb4676dd5f 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -566,7 +566,7 @@ void Object::toggleHidden() { void Object::checkObject() { Scene &scene = *_vm->_scene; Sound &sound = *_vm->_sound; - int checkFrame = _allow ? MAX_FRAME : 32000; + int checkFrame = _allow ? MAX_FRAME : FRAMES_END; bool codeFound; if (_seqTo) { @@ -693,7 +693,7 @@ void Object::checkObject() { */ bool Object::checkEndOfSequence() { Screen &screen = *_vm->_screen; - int checkFrame = _allow ? MAX_FRAME : 32000; + int checkFrame = _allow ? MAX_FRAME : FRAMES_END; bool result = false; if (_type == REMOVE || _type == INVALID) @@ -749,7 +749,7 @@ bool Object::checkEndOfSequence() { */ void Object::setObjSequence(int seq, bool wait) { Scene &scene = *_vm->_scene; - int checkFrame = _allow ? MAX_FRAME : 32000; + int checkFrame = _allow ? MAX_FRAME : FRAMES_END; if (seq >= 128) { // Loop the sequence until the count exceeded |