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

6
src/Battling/Models/Creature.cpp
View File

@@ -365,7 +365,11 @@ namespace CreatureLib::Battling {
return false;
}
auto* script = _library->GetScriptResolver()->LoadItemScript(_heldItem.GetValue());
auto scriptOpt = _library->GetScriptResolver()->LoadItemScript(_heldItem.GetValue());
if (!scriptOpt.HasValue()) {
return false;
}
auto script = scriptOpt.GetValue();
auto isCreatureUseItem = script->IsCreatureUseItem();
if (isCreatureUseItem) {
if (!script->IsUseValidForCreature(this)) {