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

Fully handle turn ordering
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2019-10-31 12:31:31 +01:00
parent 972af35ecf
commit 42c1623985
6 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@
#include "../TurnChoices/AttackTurnChoice.hpp"
#include "../Flow/TurnOrdering.hpp"
using namespace CreatureLib;
using namespace CreatureLib::Battling;
const BattleLibrary *Battle::GetLibrary() const {
@@ -39,7 +40,7 @@ void Battle::CheckChoicesSetAndRun() {
i++;
}
}
TurnOrdering::OrderChoices(choices);
TurnOrdering::OrderChoices(choices, _random);
auto choiceQueue = ChoiceQueue(choices);
this->_currentTurnQueue = &choiceQueue;
TurnHandler::RunTurn(choiceQueue);
@@ -49,3 +50,7 @@ void Battle::CheckChoicesSetAndRun() {
ChoiceQueue* Battle::GetCurrentTurnQueue() const {
return _currentTurnQueue;
}
Core::Random &Battle::GetRandom(){
return _random;
}