Deukhoofd
/
CreatureLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reset choices on side when executing turn.

This commit is contained in:
Deukhoofd 2019-11-06 18:06:48 +01:00
parent 5fc2bf564a
commit beac87f981
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Battling/Flow/TurnHandler.cpp
View File

@ -42,7 +42,7 @@ void TurnHandler::ExecuteChoice(const BaseTurnChoice *choice) {
} }
switch (choiceKind){ switch (choiceKind){
case TurnChoiceKind::Pass: return; case TurnChoiceKind::Pass: throw NotReachableException();
case TurnChoiceKind::Attack: case TurnChoiceKind::Attack:
return ExecuteAttackChoice(dynamic_cast<const AttackTurnChoice*>(choice)); return ExecuteAttackChoice(dynamic_cast<const AttackTurnChoice*>(choice));
case TurnChoiceKind::Item: case TurnChoiceKind::Item:

1
src/Battling/Models/Battle.cpp
View File

@ -50,6 +50,7 @@ void Battle::CheckChoicesSetAndRun() {
choices[i] = choice; choices[i] = choice;
i++; i++;
} }
side->ResetChoices();
} }
TurnOrdering::OrderChoices(choices, _random); TurnOrdering::OrderChoices(choices, _random);
auto choiceQueue = new ChoiceQueue(choices); auto choiceQueue = new ChoiceQueue(choices);