From 68608b081b4fb559f2754eaf5eb450e95b921121 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 6 Sep 2022 19:38:00 +0200 Subject: [PATCH] - function separators --- source/games/sw/src/sumo.cpp | 39 +++++++++++++++++++++++++++++++ source/games/sw/src/zilla.cpp | 36 +++++++++++++++++++++++++++++ source/games/sw/src/zombie.cpp | 42 ++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) diff --git a/source/games/sw/src/sumo.cpp b/source/games/sw/src/sumo.cpp index 84e9a1595..92c2b18fc 100644 --- a/source/games/sw/src/sumo.cpp +++ b/source/games/sw/src/sumo.cpp @@ -597,6 +597,12 @@ ACTOR_ACTION_SET MiniSumoActionSet = }; +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int SetupSumo(DSWActor* actor) { ANIMATOR DoActorDecide; @@ -638,6 +644,12 @@ int SetupSumo(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int NullSumo(DSWActor* actor) { if (!(actor->user.Flags & SPR_CLIMBING)) @@ -648,6 +660,12 @@ int NullSumo(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int DoSumoMove(DSWActor* actor) { if (actor->user.track >= 0) @@ -665,6 +683,11 @@ int DoSumoMove(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- int DoSumoRumble(DSWActor* actor) { @@ -698,6 +721,12 @@ int InitSumoClap(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int DoSumoDeathMelt(DSWActor* actor) { PlaySound(DIGI_SUMOFART, actor, v3df_follow); @@ -718,6 +747,11 @@ int DoSumoDeathMelt(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- void BossHealthMeter(void) { @@ -871,6 +905,11 @@ void BossHealthMeter(void) } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- #include "saveable.h" diff --git a/source/games/sw/src/zilla.cpp b/source/games/sw/src/zilla.cpp index 7b7feb97b..71c1a61f6 100644 --- a/source/games/sw/src/zilla.cpp +++ b/source/games/sw/src/zilla.cpp @@ -603,6 +603,12 @@ ACTOR_ACTION_SET ZillaActionSet = nullptr }; +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int SetupZilla(DSWActor* actor) { ANIMATOR DoActorDecide; @@ -631,6 +637,12 @@ int SetupZilla(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int NullZilla(DSWActor* actor) { getzsofslopeptr(actor->sector(), actor->spr.pos, &actor->user.hiz, &actor->user.loz); @@ -645,6 +657,12 @@ int NullZilla(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int DoZillaMove(DSWActor* actor) { short choose; @@ -679,6 +697,12 @@ int DoZillaMove(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int DoZillaStomp(DSWActor* actor) { PlaySound(DIGI_ZILLASTOMP, actor, v3df_follow); @@ -686,6 +710,12 @@ int DoZillaStomp(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int DoZillaDeathMelt(DSWActor* actor) { if (RandomRange(1000) > 800) @@ -713,6 +743,12 @@ int DoZillaDeathMelt(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + #include "saveable.h" diff --git a/source/games/sw/src/zombie.cpp b/source/games/sw/src/zombie.cpp index 9d88c2ce0..380d6f2b7 100644 --- a/source/games/sw/src/zombie.cpp +++ b/source/games/sw/src/zombie.cpp @@ -747,6 +747,12 @@ ACTOR_ACTION_SET ZombieActionSet = nullptr }; +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int SetupZombie(DSWActor* actor) { ANIMATOR DoActorDecide; @@ -769,6 +775,12 @@ int SetupZombie(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + void SpawnZombie(PLAYER* pp, DSWActor* weaponActor) { auto ownerActor = GetOwner(weaponActor); @@ -797,6 +809,12 @@ void SpawnZombie(PLAYER* pp, DSWActor* weaponActor) DoActorZrange(actorNew); } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + void SpawnZombie2(DSWActor* actor) { auto sectu = actor->sector(); @@ -844,6 +862,12 @@ void SpawnZombie2(DSWActor* actor) DoActorZrange(actorNew); } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int DoZombieMove(DSWActor* actor) { if (actor->user.Counter3++ >= ZOMBIE_TIME_LIMIT) @@ -895,6 +919,12 @@ int DoZombieMove(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int NullZombie(DSWActor* actor) { if (actor->user.Counter3++ >= ZOMBIE_TIME_LIMIT) @@ -928,6 +958,12 @@ int NullZombie(DSWActor* actor) } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + int DoZombiePain(DSWActor* actor) { NullZombie(actor); @@ -938,6 +974,12 @@ int DoZombiePain(DSWActor* actor) return 0; } +//--------------------------------------------------------------------------- +// +// +// +//--------------------------------------------------------------------------- + #include "saveable.h"