From ad733d92c68d85d4dd15f4aa09f1a34a860bec41 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sun, 15 May 2022 11:15:13 +0200 Subject: [PATCH] Fixes item use scripts not being properly initialised, and not setting its owner --- src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp b/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp index 846ab20..edc678f 100644 --- a/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp +++ b/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp @@ -60,7 +60,7 @@ private: } FunctionInfo InitializeSetOwner() { - auto val = _scriptObject->GetObjectType()->GetMethodByDecl("void SetOwner(ref@ owner)", true); + auto val = _scriptObject->GetObjectType()->GetMethodByDecl("void SetOwner(const Item@ owner)", true); if (val != nullptr) { return FunctionInfo{.Exists = true, .Function = val}; } @@ -73,7 +73,7 @@ private: #define ITEM_USE_SCRIPT_HOOK_FUNCTION(name, decl) FunctionInfo __##name = Initialize(decl) ITEM_USE_SCRIPT_HOOK_FUNCTION( - OnInitialize, "void OnInitialize(const BattleLibrary@ library, const narray@ parameters)"); + OnInitialize, "void OnInitialize(const narray@ parameters)"); ITEM_USE_SCRIPT_HOOK_FUNCTION(IsItemUsable, "bool IsItemUsable()"); ITEM_USE_SCRIPT_HOOK_FUNCTION(IsPokemonUseItem, "bool IsPokemonUseItem()"); ITEM_USE_SCRIPT_HOOK_FUNCTION(IsUseValidForPokemon, "bool IsUseValidForPokemon(Pokemon@ target)");