BLADERUNNER: Fixed function for changing actors goal

scummvm · Mar 22, 2017 · 710b48a6ff43da0546a824dc38fb77c6c9c5b576 · 710b48a
1 parent 52476b0
commit 710b48a6ff43da0546a824dc38fb77c6c9c5b576
Unified Split

Showing with 6 additions and 4 deletions.

+6 −4 engines/bladerunner/actor.cpp
diff --git 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() {