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/talk.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/talk.cpp')
-rw-r--r-- | queen/talk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp index 92f0256b9c..5b24f9c798 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -850,7 +850,7 @@ void Talk::speakSegment( } else { bob->animating = false; - bob->frameNum = 29 + bobNum + FRAMES_JOE_XTRA; + bob->frameNum = 31 + bobNum; } } @@ -913,7 +913,7 @@ void Talk::speakSegment( else parameters = findSpeechParameters(person->name, command, 0); - startFrame = 29 + bobNum + FRAMES_JOE_XTRA; + startFrame = 31 + bobNum; int faceDirection = 0; if (isJoe && _vm->logic()->joeFacing() == DIR_LEFT) |