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

Style fixes.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2021-03-26 19:14:22 +01:00
parent 47097cb9fc
commit 41475fcb2f
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CInterface/Core.hpp
View File

@ -37,10 +37,10 @@ public:
return 0; \ return 0; \
} catch (const ArbUt::Exception& e) { \ } catch (const ArbUt::Exception& e) { \
ExceptionHandler::SetLastArbUtException(__FUNCTION__, e); \ ExceptionHandler::SetLastArbUtException(__FUNCTION__, e); \
return PkmnLibException; \ return PkmnLibException; \
} catch (const std::exception& e) { \ } catch (const std::exception& e) { \
ExceptionHandler::SetLastException(__FUNCTION__, e); \ ExceptionHandler::SetLastException(__FUNCTION__, e); \
return PkmnLibException; \ return PkmnLibException; \
} }
#define SIMPLE_GET_FUNC(type, name, returnType) \ #define SIMPLE_GET_FUNC(type, name, returnType) \

6
src/ScriptResolving/AngelScript/AngelScriptItemUseScript.cpp
View File

@ -1,7 +1,8 @@
#include "AngelScriptItemUseScript.hpp" #include "AngelScriptItemUseScript.hpp"
#include "AngelScriptResolver.hpp" #include "AngelScriptResolver.hpp"
CScriptArray* AngelScriptItemUseScript::GetEffectParameters(const ArbUt::List<CreatureLib::Library::EffectParameter*>& ls) { CScriptArray*
AngelScriptItemUseScript::GetEffectParameters(const ArbUt::List<CreatureLib::Library::EffectParameter*>& ls) {
asITypeInfo* t = _resolver->GetBaseType("array<EffectParameter@>"_cnc); asITypeInfo* t = _resolver->GetBaseType("array<EffectParameter@>"_cnc);
CScriptArray* arr = CScriptArray::Create(t, ls.Count()); CScriptArray* arr = CScriptArray::Create(t, ls.Count());
for (size_t i = 0; i < ls.Count(); i++) { for (size_t i = 0; i < ls.Count(); i++) {
@ -10,8 +11,7 @@ CScriptArray* AngelScriptItemUseScript::GetEffectParameters(const ArbUt::List<Cr
return arr; return arr;
} }
void AngelScriptItemUseScript::OnInitialize( void AngelScriptItemUseScript::OnInitialize(const ArbUt::List<CreatureLib::Library::EffectParameter*>& parameters) {
const ArbUt::List<CreatureLib::Library::EffectParameter*>& parameters) {
if (__OnInitialize.Exists) { if (__OnInitialize.Exists) {
CScriptArray* arr = nullptr; CScriptArray* arr = nullptr;
AngelScriptUtils::AngelscriptFunctionCall( AngelScriptUtils::AngelscriptFunctionCall(

1
src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp
View File

@ -60,5 +60,4 @@ shared abstract class ItemUseScript {
} }
)"); )");
Ensure(r >= 0); Ensure(r >= 0);
} }