diff options
| author | Gregory Montoir | 2004-10-03 21:34:39 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-10-03 21:34:39 +0000 |
| commit | e681049e560a2efcc59e26073479e06c1030e1bc (patch) | |
| tree | 727721755d7e025c478b868fb0fe74b9f78c0931 /queen/cutaway.cpp | |
| parent | fbe5b94137bb73ad238df6d24ca48237ed493047 (diff) | |
| download | scummvm-rg350-e681049e560a2efcc59e26073479e06c1030e1bc.tar.gz scummvm-rg350-e681049e560a2efcc59e26073479e06c1030e1bc.tar.bz2 scummvm-rg350-e681049e560a2efcc59e26073479e06c1030e1bc.zip | |
merged FRAMES_JOE and FRAMES_JOE_XTRA
svn-id: r15398
Diffstat (limited to 'queen/cutaway.cpp')
| -rw-r--r-- | queen/cutaway.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index fffc781f61..266ceb5b58 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -481,7 +481,7 @@ const byte *Cutaway::getCutawayAnim(const byte *ptr, int header, CutawayAnim &an if (0 == header) { anim.object = 0; - anim.originalFrame = 29 + FRAMES_JOE_XTRA; + anim.originalFrame = 31; } else { anim.object = _vm->logic()->findBob(header); @@ -649,7 +649,7 @@ const byte *Cutaway::handleAnimation(const byte *ptr, CutawayObject &object) { } if (objAnim[i].object < 4) - bob->frameNum = 29 + objAnim[i].object + FRAMES_JOE_XTRA; + bob->frameNum = 31 + objAnim[i].object; if (objAnim[i].unpackFrame == 0) { // Turn off the bob |