Highest level actor logic requires can act

EasyRPG · Dec 6, 2018 · b436171 · b436171
1 parent 83e4626
commit b436171
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/game_battler.cpp b/src/game_battler.cpp
@@ -297,7 +297,7 @@ bool Game_Battler::UseItem(int item_id) {
 		if (skill != nullptr) {
 			Game_Battler* source = this;
 			if (skill->scope != RPG::Skill::Scope_self) {
-				source = Main_Data::game_party->GetHighestLeveledActor();
+				source = Main_Data::game_party->GetHighestLeveledActorWhoCanAct();
 			}
 			UseSkill(item->skill_id, source);
 		}

diff --git a/src/game_party.cpp b/src/game_party.cpp
@@ -632,11 +632,11 @@ bool Game_Party::IsAnyControllable() {
 	return false;
 }
 
-Game_Actor* Game_Party::GetHighestLeveledActor() const {
+Game_Actor* Game_Party::GetHighestLeveledActorWhoCanAct() const {
 	Game_Actor* best = nullptr;
 
 	for (auto* actor : GetActors()) {
-		if (best == nullptr || best->GetLevel() < actor->GetLevel()) {
+		if (actor->CanAct() && (best == nullptr || best->GetLevel() < actor->GetLevel())) {
 			best = actor;
 		}
 	}

diff --git a/src/game_party.h b/src/game_party.h
@@ -342,11 +342,11 @@ class Game_Party : public Game_Party_Base {
 	bool IsAnyControllable();
 
 	/**
-	 * Gets the actor with the highest level. If there are many, choose the one with the earliest position in the group.
+	 * Gets the actor with the highest level who can act. If there are many, choose the one with the earliest position in the group.
 	 *
-	 * @return The first Highest leveled actor.
+	 * @return The first Highest leveled actor who can act.
 	 */
-	Game_Actor* GetHighestLeveledActor() const;
+	Game_Actor* GetHighestLeveledActorWhoCanAct() const;
 
 private:
 	const RPG::SaveInventory& data() const;