ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

GRIM: The rest chore must always play. Fix #291

Browse Source
This commit is contained in:
Giulio Camuffo
2011-07-26 17:21:09 +02:00
parent 4e42d4558a
commit 131f441549
1 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/grim/actor.cpp
+5 -32
View File
@@ -1132,21 +1132,9 @@ void Actor::update() {
_walkCostume->playChoreLooping(_walkChore);
_walkCostume->fadeChoreIn(_walkChore, 150);
}
if (_restChore >= 0) {
_restCostume->fadeChoreOut(_restChore, 150);
_restCostume->stopChore(_restChore);
}
} else {
if (_walkedLast && _walkCostume->isChoring(_walkChore, false) >= 0) {
_walkCostume->fadeChoreOut(_walkChore, 150);
_walkCostume->stopChore(_walkChore);
if (_restChore >= 0) {
_restCostume->playChoreLooping(_restChore);
_restCostume->fadeChoreIn(_restChore, 150);
}
}
} else if (_walkedLast && _walkCostume->isChoring(_walkChore, false) >= 0) {
_walkCostume->fadeChoreOut(_walkChore, 150);
_walkCostume->stopChore(_walkChore);
}
}
@@ -1154,21 +1142,6 @@ void Actor::update() {
if (_walkedCur || _walkedLast)
_currTurnDir = 0;
if (_restChore >= 0) {
if (_currTurnDir != 0) {
if (_turnCostume->isChoring(getTurnChore(_currTurnDir), false) >= 0) {
_restCostume->fadeChoreOut(_restChore, 500);
_restCostume->stopChore(_restChore);
}
}
else if (_lastTurnDir != 0) {
if (!_walkedCur && _turnCostume->isChoring(getTurnChore(_lastTurnDir), false) >= 0) {
_restCostume->playChoreLooping(_restChore);
_restCostume->fadeChoreIn(_restChore, 150);
}
}
}
if (_lastTurnDir != 0 && _lastTurnDir != _currTurnDir) {
_turnCostume->fadeChoreOut(getTurnChore(_lastTurnDir), 150);
_turnCostume->stopChore(getTurnChore(_lastTurnDir));
@@ -1182,7 +1155,7 @@ void Actor::update() {
// The rest chore might have been stopped because of a
// StopActorChore(nil). Restart it if so.
if (!_walkedCur && _currTurnDir == 0 && _restChore >= 0 && _restCostume->isChoring(_restChore, false) < 0)
if (_restChore >= 0 && _restCostume->isChoring(_restChore, false) < 0)
_restCostume->playChoreLooping(_restChore);
_walkedLast = _walkedCur;
@@ -1215,7 +1188,7 @@ void Actor::update() {
if (_talkAnim != -1 && _talkChore[_talkAnim] >= 0)
_talkCostume[_talkAnim]->stopChore(_talkChore[_talkAnim]);
_talkCostume[0]->playChore(_talkChore[0]);
_talkCostume[0]->playChoreLooping(_talkChore[0]);
}
}
}