Battle: Halt the interpreter when a victory or lose condition is fulf…

…illed.

Fixes EasyRPG#1129

src/game_battle.cpp

@@ -132,6 +132,14 @@ void Game_Battle::Terminate() {
 	terminate = true;
 }
 
+bool Game_Battle::CheckWin() {
+	return !Main_Data::game_enemyparty->IsAnyActive();
+}
+
+bool Game_Battle::CheckLose() {
+	return !Main_Data::game_party->IsAnyActive();
+}
+
 Spriteset_Battle& Game_Battle::GetSpriteset() {
 	return *spriteset;
 }
@@ -294,6 +302,10 @@ bool Game_Battle::AreConditionsMet(const RPG::TroopPageCondition& condition) {
 }
 
 bool Game_Battle::UpdateEvents() {
+	if (Game_Battle::CheckWin() || Game_Battle::CheckLose()) {
+		return true;
+	}
+
 	if (interpreter->IsRunning()) {
 		return false;
 	}

src/game_battle.h

@@ -43,6 +43,20 @@ namespace Game_Battle {
 
 	void Terminate();
 
+	/**
+	 * Checks if a victory condition for the player party (enemy dead) is fulfilled.
+	 *
+	 * @return True on victory
+	 */
+	bool CheckWin();
+
+	/**
+	 * Check if a lose condition for the player party (party dead) is fulfilled.
+	 *
+	 * @return True on lose
+	 */
+	bool CheckLose();
+
 	Spriteset_Battle& GetSpriteset();
 
 	/**
@@ -131,13 +145,13 @@ namespace Game_Battle {
 	void SetBattleMode(int battle_mode_);
 	int GetBattleMode();
 
-	/** 
+	/**
 	 * Sets the party index of the latest targeted enemy. Only used by battle branch "is target"
 	 *
 	 * @param target_enemy id of targeted enemy
 	 */
 	void SetEnemyTargetIndex(int target_enemy);
-	
+
 	/**
 	 * Gets the party index of the latest targeted enemy. Only used by battle branch "is target"
 	 *

src/game_interpreter_battle.cpp

@@ -34,6 +34,11 @@ Game_Interpreter_Battle::Game_Interpreter_Battle(int depth, bool main_flag) :
 
 // Execute Command.
 bool Game_Interpreter_Battle::ExecuteCommand() {
+	if (Game_Battle::CheckWin() || Game_Battle::CheckLose()) {
+		// Interpreter is cancelled when a win/lose condition is fulfilled
+		return false;
+	}
+
 	if (index >= list.size()) {
 		return CommandEnd();
 	}

src/scene_battle_rpg2k.cpp

@@ -836,7 +836,7 @@ bool Scene_Battle_Rpg2k::DisplayMonstersInMessageWindow() {
 }
 
 bool Scene_Battle_Rpg2k::CheckWin() {
-	if (!Main_Data::game_enemyparty->IsAnyActive()) {
+	if (Game_Battle::CheckWin()) {
 		Game_Temp::battle_result = Game_Temp::BattleVictory;
 		SetState(State_Victory);
 
@@ -884,7 +884,7 @@ bool Scene_Battle_Rpg2k::CheckWin() {
 }
 
 bool Scene_Battle_Rpg2k::CheckLose() {
-	if (!Main_Data::game_party->IsAnyActive()) {
+	if (Game_Battle::CheckLose()) {
 		Game_Temp::battle_result = Game_Temp::BattleDefeat;
 		SetState(State_Defeat);
 

src/scene_battle_rpg2k3.cpp

@@ -952,7 +952,7 @@ void Scene_Battle_Rpg2k3::Escape() {
 }
 
 bool Scene_Battle_Rpg2k3::CheckWin() {
-	if (!Main_Data::game_enemyparty->IsAnyActive()) {
+	if (Game_Battle::CheckWin()) {
 		Game_Temp::battle_result = Game_Temp::BattleVictory;
 		SetState(State_Victory);
 
@@ -1023,7 +1023,7 @@ bool Scene_Battle_Rpg2k3::CheckWin() {
 }
 
 bool Scene_Battle_Rpg2k3::CheckLose() {
-	if (!Main_Data::game_party->IsAnyActive()) {
+	if (Game_Battle::CheckLose()) {
 		Game_Temp::battle_result = Game_Temp::BattleDefeat;
 		SetState(State_Defeat);