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

Fixes invalid pointers to a battle dangling when a battle is removed.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
This commit is contained in:
Deukhoofd
2020-12-28 13:40:39 +01:00
parent 69476b6f9d
commit a284641b5a
7 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,11 +6,11 @@
using namespace CreatureLib::Battling;
void TurnHandler::RunTurn(ArbUt::BorrowedPtr<ChoiceQueue> queue) {
void TurnHandler::RunTurn(ArbUt::BorrowedPtr<ChoiceQueue> queue, ArbUt::BorrowedPtr<Battle> battle) {
for (auto choice : queue->GetInnerQueue()) {
HOOK(OnBeforeTurn, choice, choice.get());
}
while (queue->HasNext()) {
while (queue->HasNext() && !battle->HasEnded()) {
auto item = queue->Dequeue();
EnsureNotNull(item)
Ensure(item->GetUser()->GetBattle().HasValue())

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

@@ -20,7 +20,7 @@ namespace CreatureLib::Battling {
static void ExecuteFleeChoice(ArbUt::BorrowedPtr<FleeTurnChoice> choice);
public:
static void RunTurn(ArbUt::BorrowedPtr<ChoiceQueue> queue);
static void RunTurn(ArbUt::BorrowedPtr<ChoiceQueue> queue, ArbUt::BorrowedPtr<Battle> battle);
};
}