diff --git a/CInterface/Core.hpp b/CInterface/Core.hpp index 762c6a4..4d5ce25 100644 --- a/CInterface/Core.hpp +++ b/CInterface/Core.hpp @@ -37,10 +37,10 @@ public: return 0; \ } catch (const ArbUt::Exception& e) { \ ExceptionHandler::SetLastArbUtException(__FUNCTION__, e); \ - return PkmnLibException; \ + return PkmnLibException; \ } catch (const std::exception& e) { \ ExceptionHandler::SetLastException(__FUNCTION__, e); \ - return PkmnLibException; \ + return PkmnLibException; \ } #define SIMPLE_GET_FUNC(type, name, returnType) \ diff --git a/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.cpp b/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.cpp index af11b42..6c8a654 100644 --- a/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.cpp +++ b/src/ScriptResolving/AngelScript/AngelScriptItemUseScript.cpp @@ -1,7 +1,8 @@ #include "AngelScriptItemUseScript.hpp" #include "AngelScriptResolver.hpp" -CScriptArray* AngelScriptItemUseScript::GetEffectParameters(const ArbUt::List& ls) { +CScriptArray* +AngelScriptItemUseScript::GetEffectParameters(const ArbUt::List& ls) { asITypeInfo* t = _resolver->GetBaseType("array"_cnc); CScriptArray* arr = CScriptArray::Create(t, ls.Count()); for (size_t i = 0; i < ls.Count(); i++) { @@ -10,8 +11,7 @@ CScriptArray* AngelScriptItemUseScript::GetEffectParameters(const ArbUt::List& parameters) { +void AngelScriptItemUseScript::OnInitialize(const ArbUt::List& parameters) { if (__OnInitialize.Exists) { CScriptArray* arr = nullptr; AngelScriptUtils::AngelscriptFunctionCall( diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp index 23f4469..f94cdab 100644 --- a/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp @@ -60,5 +60,4 @@ shared abstract class ItemUseScript { } )"); Ensure(r >= 0); - }