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

Style fixes.
continuous-integration/drone/push Build was killed Details

This commit is contained in:
Deukhoofd 2021-03-27 13:46:34 +01:00
parent af559f757c
commit 9b4cb06641
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ScriptResolving/AngelScript/AngelScriptScript.cpp
View File

@ -268,12 +268,8 @@ void AngelScriptScript::ChangePriority(CreatureLib::Battling::AttackTurnChoice*
}) })
} }
void AngelScriptScript::OnFail(CreatureLib::Battling::Creature* target) { void AngelScriptScript::OnFail(CreatureLib::Battling::Creature* target) {
CALL_HOOK(OnFail, { CALL_HOOK(OnFail, { ctx->SetArgObject(0, (void*)target); })
ctx->SetArgObject(0, (void*)target);
})
} }
void AngelScriptScript::OnOpponentFail(CreatureLib::Battling::Creature* target) { void AngelScriptScript::OnOpponentFail(CreatureLib::Battling::Creature* target) {
CALL_HOOK(OnOpponentFail, { CALL_HOOK(OnOpponentFail, { ctx->SetArgObject(0, (void*)target); })
ctx->SetArgObject(0, (void*)target);
})
} }

3
src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp
View File

@ -41,8 +41,7 @@ void RegisterExecutingAttack::RegisterHitData(asIScriptEngine* engine) {
asCALL_THISCALL); asCALL_THISCALL);
Ensure(r >= 0); Ensure(r >= 0);
r = engine->RegisterObjectMethod("HitData", "void Fail()", r = engine->RegisterObjectMethod("HitData", "void Fail()",
asMETHOD(CreatureLib::Battling::ExecutingAttack::HitData, Fail), asMETHOD(CreatureLib::Battling::ExecutingAttack::HitData, Fail), asCALL_THISCALL);
asCALL_THISCALL);
Ensure(r >= 0); Ensure(r >= 0);
} }
void RegisterExecutingAttack::RegisterExecutingAttackType(asIScriptEngine* engine) { void RegisterExecutingAttack::RegisterExecutingAttackType(asIScriptEngine* engine) {

4
src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp
View File

@ -187,8 +187,8 @@ void RegisterPokemonClass::RegisterPokemonType(asIScriptEngine* engine) {
asCALL_THISCALL); asCALL_THISCALL);
Ensure(r >= 0); Ensure(r >= 0);
r = engine->RegisterObjectMethod("Pokemon", "Battle@ get_Battle() const property", r = engine->RegisterObjectMethod("Pokemon", "Battle@ get_Battle() const property", asFUNCTION(GetBattleWrapper),
asFUNCTION(GetBattleWrapper), asCALL_CDECL_OBJFIRST); asCALL_CDECL_OBJFIRST);
Ensure(r >= 0); Ensure(r >= 0);
r = engine->RegisterObjectMethod("Pokemon", "BattleSide@ get_BattleSide() const property", r = engine->RegisterObjectMethod("Pokemon", "BattleSide@ get_BattleSide() const property",
asFUNCTION(GetBattleSideWrapper), asCALL_CDECL_OBJFIRST); asFUNCTION(GetBattleSideWrapper), asCALL_CDECL_OBJFIRST);