From 39a163a1aa83afb37a6cec5ae58283ce0a27ff22 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 14 May 2022 17:40:40 +0200 Subject: [PATCH] Fixes angelscript item use script function being wrong --- src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp | 2 +- tests/ScriptTests/WASM/ScriptResolverTests.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp b/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp index 71f30bd..846ab20 100644 --- a/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp +++ b/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp @@ -79,7 +79,7 @@ private: ITEM_USE_SCRIPT_HOOK_FUNCTION(IsUseValidForPokemon, "bool IsUseValidForPokemon(Pokemon@ target)"); ITEM_USE_SCRIPT_HOOK_FUNCTION(IsHoldable, "bool IsHoldable()"); ITEM_USE_SCRIPT_HOOK_FUNCTION(OnUse, "void OnUse()"); - ITEM_USE_SCRIPT_HOOK_FUNCTION(OnPokemonUse, "void OnPokemonUse(Pokemon@ target)"); + ITEM_USE_SCRIPT_HOOK_FUNCTION(OnPokemonUse, "void OnPokemonUse(Pokemon@ target, bool isBattleUse)"); ITEM_USE_SCRIPT_HOOK_FUNCTION(ModifyPokeballCatchBonus, "void ModifyPokeballCatchBonus(Pokemon@ target, uint8& catchBonus)"); }; diff --git a/tests/ScriptTests/WASM/ScriptResolverTests.cpp b/tests/ScriptTests/WASM/ScriptResolverTests.cpp index 98da026..15bd03d 100644 --- a/tests/ScriptTests/WASM/ScriptResolverTests.cpp +++ b/tests/ScriptTests/WASM/ScriptResolverTests.cpp @@ -57,7 +57,6 @@ TEST_CASE("Get a script resolver, load a real wasm script, load test script") { auto script = lib->LoadScript(nullptr, ScriptCategory::Attack, "test"_cnc); EnsureNotNull(script); script.GetValue()->OnInitialize(TestLibrary::GetLibrary(), {}); - delete script; } #endif