thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRIM: Don't stop the talk chores, but set them at the last frame. Fix #305

Browse source
This commit is contained in:
Giulio Camuffo 2011-07-28 15:52:38 +02:00
parent 7a8354d429
commit abfa56a336
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/grim/actor.cpp
View file

@ -863,7 +863,7 @@ void Actor::sayLine(const char *msgId, bool background) {
if (_talkChore[0] >= 0 && _talkCostume[0]->isChoring(_talkChore[0], true) < 0) { if (_talkChore[0] >= 0 && _talkCostume[0]->isChoring(_talkChore[0], true) < 0) {
// _talkChore[0] is *_stop_talk // _talkChore[0] is *_stop_talk
_talkCostume[0]->stopChore(_talkChore[0]); _talkCostume[0]->setChoreLastFrame(_talkChore[0]);
} }
// Sometimes actors speak offscreen before they, including their // Sometimes actors speak offscreen before they, including their
// talk chores are initialized. // talk chores are initialized.
@ -946,7 +946,7 @@ void Actor::shutUp() {
} }
if (_lipSync) { if (_lipSync) {
if (_talkAnim != -1 && _talkChore[_talkAnim] >= 0) if (_talkAnim != -1 && _talkChore[_talkAnim] >= 0)
_talkCostume[_talkAnim]->stopChore(_talkChore[_talkAnim]); _talkCostume[_talkAnim]->setChoreLastFrame(_talkChore[_talkAnim]);
_lipSync = NULL; _lipSync = NULL;
stopTalking(); stopTalking();
} else if (_mumbleChore >= 0 && _mumbleCostume->isChoring(_mumbleChore, false) >= 0) { } else if (_mumbleChore >= 0 && _mumbleCostume->isChoring(_mumbleChore, false) >= 0) {
@ -1205,15 +1205,16 @@ void Actor::update() {
if (anim != -1) { if (anim != -1) {
if (_talkChore[anim] >= 0) { if (_talkChore[anim] >= 0) {
if (_talkAnim != -1 && _talkChore[_talkAnim] >= 0) if (_talkAnim != -1 && _talkChore[_talkAnim] >= 0)
_talkCostume[_talkAnim]->stopChore(_talkChore[_talkAnim]); _talkCostume[_talkAnim]->setChoreLastFrame(_talkChore[_talkAnim]);
_talkAnim = anim; _talkAnim = anim;
_talkCostume[_talkAnim]->playChoreLooping(_talkChore[_talkAnim]); _talkCostume[_talkAnim]->playChore(_talkChore[_talkAnim]);
} }
} else { } else {
if (_talkAnim != -1 && _talkChore[_talkAnim] >= 0) if (_talkAnim != -1 && _talkChore[_talkAnim] >= 0)
_talkCostume[_talkAnim]->stopChore(_talkChore[_talkAnim]); _talkCostume[_talkAnim]->setChoreLastFrame(_talkChore[_talkAnim]);
_talkAnim = 0;
stopTalking(); stopTalking();
} }
} }