Handle path on follow events

ramon-bernardo · Nov 5, 2024 · ea23035 · ea23035
1 parent de13332
commit ea23035
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/src/creature.cpp b/src/creature.cpp
@@ -1030,23 +1030,12 @@ void Creature::setFollowCreature(Creature* creature)
 		return;
 	}
 
-	if (!listWalkDir.empty()) {
-		listWalkDir.clear();
-		onWalkAborted();
-	}
-
-	hasFollowPath = false;
-	forceUpdateFollowPath = false;
-	isUpdatingPath = true;
-
 	followCreature = creature;
 	onFollowCreature(creature);
 }
 
 void Creature::removeFollowCreature()
 {
-	isUpdatingPath = false;
-
 	followCreature = nullptr;
 	onUnfollowCreature();
 }
@@ -1060,6 +1049,20 @@ bool Creature::canFollowCreature(Creature* creature)
 	return canSee(creaturePos);
 }
 
+void Creature::onFollowCreature(const Creature*)
+{
+	if (!listWalkDir.empty()) {
+		listWalkDir.clear();
+		onWalkAborted();
+	}
+
+	hasFollowPath = false;
+	forceUpdateFollowPath = false;
+	isUpdatingPath = true;
+}
+
+void Creature::onUnfollowCreature() { isUpdatingPath = false; }
+
 double Creature::getDamageRatio(Creature* attacker) const
 {
 	uint32_t totalDamage = 0;

diff --git a/src/creature.h b/src/creature.h
@@ -195,8 +195,8 @@ class Creature : virtual public Thing
 	virtual bool hasFollowingCreature(Creature* creature) { return followCreature == creature; }
 
 	// follow events
-	virtual void onFollowCreature(const Creature*) {}
-	virtual void onUnfollowCreature() {}
+	virtual void onFollowCreature(const Creature*);
+	virtual void onUnfollowCreature();
 	virtual void onFollowCreatureComplete(const Creature*) {}
 
 	// combat functions

diff --git a/src/player.cpp b/src/player.cpp
@@ -3450,7 +3450,12 @@ uint64_t Player::getGainedExperience(Creature* attacker) const
 	return 0;
 }
 
-void Player::onUnfollowCreature() { stopWalk(); }
+void Player::onUnfollowCreature()
+{
+	Creature::onUnfollowCreature();
+
+	stopWalk();
+}
 
 void Player::setChaseMode(bool mode)
 {