From deaee586ed035859662037d10f2f5c152fda0c0e Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 29 Jul 2019 21:05:30 +0100
Subject: [PATCH] Make MANIASPHERES' #define'd away stuff also recreatable with
SOC, since I want to release it publically if the team don't want it.
---
src/info.c | 6 +++++-
src/p_setup.c | 12 +-----------
src/st_stuff.c | 6 +-----
3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/info.c b/src/info.c
index a4446d6571..0ae723546a 100644
--- a/src/info.c
+++ b/src/info.c
@@ -1791,7 +1791,11 @@ state_t states[NUMSTATES] =
// Blue Sphere for special stages
{SPR_SPHR, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_BLUESPHERE
- {SPR_SPHR, FF_FULLBRIGHT|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 1, 4, S_NULL}, // S_BLUESPHEREBONUS
+ {SPR_SPHR, FF_FULLBRIGHT
+#ifdef MANIASPHERES
+ |FF_ANIMATE|FF_RANDOMANIM
+#endif
+ , -1, {NULL}, 1, 4, S_NULL}, // S_BLUESPHEREBONUS
{SPR_SPHR, 0, 20, {NULL}, 0, 0, S_NULL}, // S_BLUESPHERESPARK
// Bomb Sphere
diff --git a/src/p_setup.c b/src/p_setup.c
index c0aa7ffa35..0b391f390d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -859,12 +859,7 @@ void P_ReloadRings(void)
mt->z = (INT16)(R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)
->sector->floorheight>>FRACBITS);
- P_SpawnHoopsAndRings(mt,
-#ifdef MANIASPHERES
- true);
-#else
- !G_IsSpecialStage(gamemap)); // prevent flashing spheres in special stages
-#endif
+ P_SpawnHoopsAndRings(mt, true);
}
}
for (i = 0; i < numHoops; i++)
@@ -878,11 +873,6 @@ void P_SwitchSpheresBonusMode(boolean bonustime)
mobj_t *mo;
thinker_t *th;
-#ifndef MANIASPHERES
- if (G_IsSpecialStage(gamemap)) // prevent flashing spheres in special stages
- return;
-#endif
-
// scan the thinkers to find spheres to switch
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
{
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 4122793ad4..3b8fc749d2 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1617,12 +1617,8 @@ static void ST_drawNiGHTSHUD(void)
#endif
ST_DrawTopLeftOverlayPatch(16, 8, nbracket);
if (G_IsSpecialStage(gamemap))
-#ifdef MANIASPHERES
ST_DrawTopLeftOverlayPatch(24, 16, (
- (stplyr->bonustime && (leveltime & 4)) ? nssbon : nsshud));
-#else
- ST_DrawTopLeftOverlayPatch(24, 16, (nsshud));
-#endif
+ (stplyr->bonustime && (leveltime & 4) && (states[S_BLUESPHEREBONUS].frame & FF_ANIMATE)) ? nssbon : nsshud));
else
ST_DrawTopLeftOverlayPatch(24, 16, *(((stplyr->bonustime) ? nbon : nhud)+((leveltime/2)%12)));
--
GitLab