From 9b4cb06641fc46846ce581ff55755721072ce44d Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 27 Mar 2021 13:46:34 +0100 Subject: [PATCH] Style fixes. --- src/ScriptResolving/AngelScript/AngelScriptScript.cpp | 8 ++------ .../TypeRegistry/Battling/RegisterExecutingAttack.cpp | 3 +-- .../TypeRegistry/Battling/RegisterPokemonClass.cpp | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/ScriptResolving/AngelScript/AngelScriptScript.cpp b/src/ScriptResolving/AngelScript/AngelScriptScript.cpp index 7ec823c..15a4fd8 100644 --- a/src/ScriptResolving/AngelScript/AngelScriptScript.cpp +++ b/src/ScriptResolving/AngelScript/AngelScriptScript.cpp @@ -268,12 +268,8 @@ void AngelScriptScript::ChangePriority(CreatureLib::Battling::AttackTurnChoice* }) } void AngelScriptScript::OnFail(CreatureLib::Battling::Creature* target) { - CALL_HOOK(OnFail, { - ctx->SetArgObject(0, (void*)target); - }) + CALL_HOOK(OnFail, { ctx->SetArgObject(0, (void*)target); }) } void AngelScriptScript::OnOpponentFail(CreatureLib::Battling::Creature* target) { - CALL_HOOK(OnOpponentFail, { - ctx->SetArgObject(0, (void*)target); - }) + CALL_HOOK(OnOpponentFail, { ctx->SetArgObject(0, (void*)target); }) } diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp index efd8075..b06d928 100644 --- a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp @@ -41,8 +41,7 @@ void RegisterExecutingAttack::RegisterHitData(asIScriptEngine* engine) { asCALL_THISCALL); Ensure(r >= 0); r = engine->RegisterObjectMethod("HitData", "void Fail()", - asMETHOD(CreatureLib::Battling::ExecutingAttack::HitData, Fail), - asCALL_THISCALL); + asMETHOD(CreatureLib::Battling::ExecutingAttack::HitData, Fail), asCALL_THISCALL); Ensure(r >= 0); } void RegisterExecutingAttack::RegisterExecutingAttackType(asIScriptEngine* engine) { diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp index c1fbec3..bd21a3e 100644 --- a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp @@ -187,8 +187,8 @@ void RegisterPokemonClass::RegisterPokemonType(asIScriptEngine* engine) { asCALL_THISCALL); Ensure(r >= 0); - r = engine->RegisterObjectMethod("Pokemon", "Battle@ get_Battle() const property", - asFUNCTION(GetBattleWrapper), asCALL_CDECL_OBJFIRST); + r = engine->RegisterObjectMethod("Pokemon", "Battle@ get_Battle() const property", asFUNCTION(GetBattleWrapper), + asCALL_CDECL_OBJFIRST); Ensure(r >= 0); r = engine->RegisterObjectMethod("Pokemon", "BattleSide@ get_BattleSide() const property", asFUNCTION(GetBattleSideWrapper), asCALL_CDECL_OBJFIRST);