From 8de1d4d63529fef378c9ad1e3211493c03d23767 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 20 Nov 2021 10:59:18 +0100 Subject: [PATCH] Adds const marker to new GetEffectiveness helper in Angelscript. --- .../TypeRegistry/Battling/RegisterPokemonClass.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp index 8f7065e..206af98 100644 --- a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp @@ -81,7 +81,8 @@ static CScriptHandle AddVolatileWrapper(PkmnLib::Battling::Pokemon* obj, const A return handle; } -static float GetEffectivenessHelper(CreatureLib::Library::TypeLibrary* typeLib, u8 attackingType, PkmnLib::Battling::Pokemon* pokemon){ +static float GetEffectivenessHelper(CreatureLib::Library::TypeLibrary* typeLib, u8 attackingType, + PkmnLib::Battling::Pokemon* pokemon) { return typeLib->GetEffectiveness(attackingType, pokemon->GetTypes()); } @@ -194,10 +195,8 @@ void RegisterPokemonClass::RegisterPokemonType(asIScriptEngine* engine) { asMETHOD(PkmnLib::Battling::Pokemon, SetStatus), asCALL_THISCALL); Ensure(r >= 0); - - - - r = engine->RegisterObjectMethod("TypeLibrary", "float GetEffectiveness(uint8 attackingType, Pokemon@ defender)", + r = engine->RegisterObjectMethod("TypeLibrary", + "float GetEffectiveness(uint8 attackingType, Pokemon@ defender) const", asFUNCTION(GetEffectivenessHelper), asCALL_CDECL_OBJFIRST); Ensure(r >= 0); } \ No newline at end of file