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

Fixes angelscript item use script function being wrong
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2022-05-14 17:40:40 +02:00
parent cf34563a56
commit 39a163a1aa
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ScriptResolving/AngelScript/AngelScriptItemUseScript.hpp
View File

@ -79,7 +79,7 @@ private:
ITEM_USE_SCRIPT_HOOK_FUNCTION(IsUseValidForPokemon, "bool IsUseValidForPokemon(Pokemon@ target)"); ITEM_USE_SCRIPT_HOOK_FUNCTION(IsUseValidForPokemon, "bool IsUseValidForPokemon(Pokemon@ target)");
ITEM_USE_SCRIPT_HOOK_FUNCTION(IsHoldable, "bool IsHoldable()"); ITEM_USE_SCRIPT_HOOK_FUNCTION(IsHoldable, "bool IsHoldable()");
ITEM_USE_SCRIPT_HOOK_FUNCTION(OnUse, "void OnUse()"); 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, ITEM_USE_SCRIPT_HOOK_FUNCTION(ModifyPokeballCatchBonus,
"void ModifyPokeballCatchBonus(Pokemon@ target, uint8& catchBonus)"); "void ModifyPokeballCatchBonus(Pokemon@ target, uint8& catchBonus)");
}; };

1
tests/ScriptTests/WASM/ScriptResolverTests.cpp
View File

@ -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); auto script = lib->LoadScript(nullptr, ScriptCategory::Attack, "test"_cnc);
EnsureNotNull(script); EnsureNotNull(script);
script.GetValue()->OnInitialize(TestLibrary::GetLibrary(), {}); script.GetValue()->OnInitialize(TestLibrary::GetLibrary(), {});
delete script;
} }
#endif #endif