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

Use smart ArbUt pointers for returning scripts.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2022-05-14 15:09:58 +02:00
parent cd50b2c2e8
commit 0117cb9d64
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,8 +367,8 @@ void TurnHandler::ExecuteItemChoice(const ArbUt::BorrowedPtr<ItemTurnChoice>& ch
if (!battle.HasValue()) {
return;
}
auto* script = battle.GetValue()->GetLibrary()->GetScriptResolver()->LoadItemScript(choice->GetItem());
if (script == nullptr) {
auto script = battle.GetValue()->GetLibrary()->GetScriptResolver()->LoadItemScript(choice->GetItem());
if (!script.HasValue()) {
return;
}
const auto& targetIndex = choice->GetTarget();
@@ -376,17 +376,17 @@ void TurnHandler::ExecuteItemChoice(const ArbUt::BorrowedPtr<ItemTurnChoice>& ch
if (targetIndex.has_value()) {
target = battle.GetValue()->GetCreature(targetIndex.value());
}
auto isCreatureUseItem = script->IsCreatureUseItem();
auto isCreatureUseItem = script.GetValue()->IsCreatureUseItem();
if (isCreatureUseItem && !target.HasValue()) {
target = choice->GetUser();
}
if (isCreatureUseItem) {
if (!script->IsUseValidForCreature(target.GetValue())) {
if (!script.GetValue()->IsUseValidForCreature(target.GetValue())) {
return;
}
script->OnCreatureUse(target.GetValue(), true);
script.GetValue()->OnCreatureUse(target.GetValue(), true);
} else {
script->OnUse(battle.GetValue());
script.GetValue()->OnUse(battle.GetValue());
}
}