From beac87f98132297729e2b6fdae487e4de2cde872 Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Wed, 6 Nov 2019 18:06:48 +0100
Subject: [PATCH] Reset choices on side when executing turn.

---
 src/Battling/Flow/TurnHandler.cpp | 2 +-
 src/Battling/Models/Battle.cpp    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Battling/Flow/TurnHandler.cpp b/src/Battling/Flow/TurnHandler.cpp
index 13bfc92..4e4c623 100644
--- a/src/Battling/Flow/TurnHandler.cpp
+++ b/src/Battling/Flow/TurnHandler.cpp
@@ -42,7 +42,7 @@ void TurnHandler::ExecuteChoice(const BaseTurnChoice *choice) {
     }
 
     switch (choiceKind){
-        case TurnChoiceKind::Pass: return;
+        case TurnChoiceKind::Pass: throw NotReachableException();
         case TurnChoiceKind::Attack:
             return ExecuteAttackChoice(dynamic_cast<const AttackTurnChoice*>(choice));
         case TurnChoiceKind::Item:
diff --git a/src/Battling/Models/Battle.cpp b/src/Battling/Models/Battle.cpp
index 4dc1220..c259f92 100644
--- a/src/Battling/Models/Battle.cpp
+++ b/src/Battling/Models/Battle.cpp
@@ -50,6 +50,7 @@ void Battle::CheckChoicesSetAndRun() {
            choices[i] = choice;
            i++;
        }
+       side->ResetChoices();
     }
     TurnOrdering::OrderChoices(choices, _random);
     auto choiceQueue = new ChoiceQueue(choices);