[Scummvm-git-logs] scummvm master -> 710b48a6ff43da0546a824dc38fb77c6c9c5b576
peterkohaut
peterkohaut at users.noreply.github.com
Thu Mar 23 00:58:00 CET 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
710b48a6ff BLADERUNNER: Fixed function for changing actors goal
Commit: 710b48a6ff43da0546a824dc38fb77c6c9c5b576
https://github.com/scummvm/scummvm/commit/710b48a6ff43da0546a824dc38fb77c6c9c5b576
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2017-03-23T00:57:35+01:00
Commit Message:
BLADERUNNER: Fixed function for changing actors goal
Changed paths:
engines/bladerunner/actor.cpp
diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index 3742928..597dc60 100644
--- a/engines/bladerunner/actor.cpp
+++ b/engines/bladerunner/actor.cpp
@@ -1006,12 +1006,14 @@ int Actor::getAnimationMode() {
}
void Actor::setGoal(int goalNumber) {
- if (goalNumber == _goalNumber) {
+ int oldGoalNumber = _goalNumber;
+ _goalNumber = goalNumber;
+ if (goalNumber == oldGoalNumber) {
return;
- }
+ }
- _vm->_aiScripts->GoalChanged(_id, _goalNumber, goalNumber);
- _vm->_script->ActorChangedGoal(_id, goalNumber, _goalNumber, _vm->_scene->getSetId() == _setId);
+ _vm->_aiScripts->GoalChanged(_id, oldGoalNumber, goalNumber);
+ _vm->_script->ActorChangedGoal(_id, goalNumber, oldGoalNumber, _vm->_scene->getSetId() == _setId);
}
int Actor::getGoal() {
More information about the Scummvm-git-logs
mailing list