KOTORBASE: Fix stuck animations when switching party leader

xoreos · Jun 22, 2019 · 5d5b7ec · 5d5b7ec
1 parent 6af0a51
commit 5d5b7ec
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/engines/kotorbase/module.cpp b/src/engines/kotorbase/module.cpp
@@ -704,6 +704,7 @@ void Module::handleDelayedInteractions() {
 
 void Module::openContainer(Placeable *placeable) {
 	_cameraController.stopMovement();
+	_partyLeaderController.clearUserInput();
 	_partyLeaderController.stopMovement();
 
 	_ingame->hideSelection();
@@ -1043,6 +1044,7 @@ void Module::startConversation(const Common::UString &name, Aurora::NWScript::Ob
 
 	if (_dialog->isConversationActive()) {
 		_cameraController.stopMovement();
+		_partyLeaderController.clearUserInput();
 		_partyLeaderController.stopMovement();
 
 		_ingame->hide();
@@ -1116,6 +1118,7 @@ void Module::addItemToActiveObject(const Common::UString &item, int count) {
 }
 
 void Module::notifyPartyLeaderChanged() {
+	_partyLeaderController.stopMovement();
 	_cameraController.updateTarget();
 	updateMinimap();
 	updateCurrentPartyGUI();

diff --git a/src/engines/kotorbase/partycontroller.cpp b/src/engines/kotorbase/partycontroller.cpp
@@ -116,10 +116,10 @@ void PartyController::setPartyLeaderByIndex(int index) {
 	std::pair<int, Creature *> nextLeader = _party[0];
 
 	prevLeader.second->setUsable(true);
+	prevLeader.second->playDefaultAnimation();
 
 	nextLeader.second->setUsable(false);
 	nextLeader.second->clearAllActions();
-	nextLeader.second->playDefaultAnimation();
 
 	_module->notifyPartyLeaderChanged();
 }

diff --git a/src/engines/kotorbase/partyleader.cpp b/src/engines/kotorbase/partyleader.cpp
@@ -40,9 +40,12 @@ PartyLeaderController::PartyLeaderController(Module *module) :
 		_moving(false) {
 }
 
-void PartyLeaderController::stopMovement() {
+void PartyLeaderController::clearUserInput() {
 	_forwardMovementWanted = false;
 	_backwardMovementWanted = false;
+}
+
+void PartyLeaderController::stopMovement() {
 	_module->getPartyLeader()->playDefaultAnimation();
 	_moving = false;
 }

diff --git a/src/engines/kotorbase/partyleader.h b/src/engines/kotorbase/partyleader.h
@@ -37,6 +37,7 @@ class PartyLeaderController {
 public:
 	PartyLeaderController(Module *module);
 
+	void clearUserInput();
 	void stopMovement();
 	bool handleEvent(const Events::Event &e);
 	bool processMovement(float frameTime);