From f13b78e297bf2696384a134a2e278b90e1490aa4 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sun, 15 May 2022 10:00:25 +0200 Subject: [PATCH] LoadItemScript should return a borrowed ptr --- CInterface/Battling/ScriptResolver.cpp | 2 +- src/Battling/ScriptHandling/ScriptResolver.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CInterface/Battling/ScriptResolver.cpp b/CInterface/Battling/ScriptResolver.cpp index bf6b9bf..63abc43 100644 --- a/CInterface/Battling/ScriptResolver.cpp +++ b/CInterface/Battling/ScriptResolver.cpp @@ -16,5 +16,5 @@ export_func u8 CreatureLib_ScriptResolver_LoadScript(BattleScript*& out, ScriptR export_func u8 CreatureLib_ScriptResolver_LoadItemScript(ItemUseScript*& out, ScriptResolver* p, const CreatureLib::Library::Item* item) { - Try(out = p->LoadItemScript(item).TakeOwnership();) + Try(out = p->LoadItemScript(item);) }; diff --git a/src/Battling/ScriptHandling/ScriptResolver.hpp b/src/Battling/ScriptHandling/ScriptResolver.hpp index 1695737..9d184f2 100644 --- a/src/Battling/ScriptHandling/ScriptResolver.hpp +++ b/src/Battling/ScriptHandling/ScriptResolver.hpp @@ -24,7 +24,7 @@ namespace CreatureLib::Battling { return nullptr; }; - virtual ArbUt::OptionalUniquePtr + virtual ArbUt::OptionalBorrowedPtr LoadItemScript([[maybe_unused]] const CreatureLib::Library::Item* non_null item) { return nullptr; };