diff --git a/src/dehacked.c b/src/dehacked.c
index 60f3b05921a3ae5ec6782f80e8898f082a8c9a6d..926c3a4889bd5a9f9fc2bae956f9ebc80f8ccf40 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -6229,9 +6229,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
// Collectible Items
"MT_RING",
"MT_FLINGRING", // Lost ring
-#ifdef BLUE_SPHERES
"MT_BLUEBALL", // Blue sphere replacement for special stages
-#endif
"MT_REDTEAMRING", //Rings collectable by red team.
"MT_BLUETEAMRING", //Rings collectable by blue team.
"MT_EMMY", // emerald token for special stage
diff --git a/src/doomdef.h b/src/doomdef.h
index 0fc4a1fea7c43ee695719ed586637da082a83c41..4fd50e9279afd7b42fbb0c8645ae89fb01f36d19 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -449,10 +449,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// Polyobject fake flat code
#define POLYOBJECTS_PLANES
-/// Blue spheres for future use.
-/// \todo Remove this define.
-#define BLUE_SPHERES // Blue spheres for future use.
-
/// Improved way of dealing with ping values and a ping limit.
#define NEWPING
diff --git a/src/info.c b/src/info.c
index fb19fa2b43113e5f5e5747e654c38b205ef1a5d9..0eda417708b0980515f528e05cd253b697621e7c 100644
--- a/src/info.c
+++ b/src/info.c
@@ -4569,7 +4569,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
-#ifdef BLUE_SPHERES
{ // MT_BLUEBALL
-1, // doomednum
S_BLUEBALL, // spawnstate
@@ -4596,7 +4595,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_SLIDEME|MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
S_NULL // raisestate
},
-#endif
{ // MT_REDTEAMRING
308, // doomednum
diff --git a/src/info.h b/src/info.h
index 9596f038421bd82f2b7c8b6235c63a8ce1994326..6e14448f470db76359c825d5ec993603249e1a4d 100644
--- a/src/info.h
+++ b/src/info.h
@@ -3049,9 +3049,7 @@ typedef enum mobj_type
// Collectible Items
MT_RING,
MT_FLINGRING, // Lost ring
-#ifdef BLUE_SPHERES
MT_BLUEBALL, // Blue sphere replacement for special stages
-#endif
MT_REDTEAMRING, //Rings collectable by red team.
MT_BLUETEAMRING, //Rings collectable by blue team.
MT_EMMY, // emerald token for special stage
diff --git a/src/p_inter.c b/src/p_inter.c
index 6ab6aaf40dd5c823a07e698e460e0a2b22fc6293..b8101f12b1561f97c88e64bebd30ce99e215c189 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -405,7 +405,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if ((maptol & TOL_NIGHTS) && special->type != MT_FLINGCOIN)
P_DoNightsScore(player);
break;
-#ifdef BLUE_SPHERES
case MT_BLUEBALL:
if (!(P_CanPickupItem(player, false)))
return;
@@ -422,7 +421,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (maptol & TOL_NIGHTS)
P_DoNightsScore(player);
break;
-#endif
case MT_AUTOPICKUP:
case MT_BOUNCEPICKUP:
case MT_SCATTERPICKUP:
@@ -766,10 +764,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
}
if (!(mo2->type == MT_NIGHTSWING || mo2->type == MT_RING || mo2->type == MT_COIN
-#ifdef BLUE_SPHERES
- || mo2->type == MT_BLUEBALL
-#endif
- ))
+ || mo2->type == MT_BLUEBALL))
continue;
// Yay! The thing's in reach! Pull it in!
diff --git a/src/p_mobj.c b/src/p_mobj.c
index cb9bc775a91385190bce136b7457b26cf28133cb..4e60ad6121c83f92aebe9508a6d40b09965fa60c 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2188,9 +2188,7 @@ static boolean P_ZMovement(mobj_t *mo)
case MT_RING: // Ignore still rings
case MT_COIN:
-#ifdef BLUE_SPHERES
case MT_BLUEBALL:
-#endif
case MT_REDTEAMRING:
case MT_BLUETEAMRING:
case MT_FLINGRING:
@@ -6479,14 +6477,12 @@ void P_MobjThinker(mobj_t *mobj)
else if (mobj->health <= 0) // Dead things think differently than the living.
switch (mobj->type)
{
-#ifdef BLUE_SPHERES
case MT_BLUEBALL:
if ((mobj->tics>>2)+1 > 0 && (mobj->tics>>2)+1 <= tr_trans60) // tr_trans50 through tr_trans90, shifting once every second frame
mobj->frame = (NUMTRANSMAPS-((mobj->tics>>2)+1))<<FF_TRANSSHIFT;
else // tr_trans60 otherwise
mobj->frame = tr_trans60<<FF_TRANSSHIFT;
break;
-#endif
case MT_EGGCAPSULE:
if (mobj->z <= mobj->floorz)
{
@@ -6944,9 +6940,7 @@ void P_MobjThinker(mobj_t *mobj)
break;
case MT_RING:
case MT_COIN:
-#ifdef BLUE_SPHERES
case MT_BLUEBALL:
-#endif
case MT_REDTEAMRING:
case MT_BLUETEAMRING:
// No need to check water. Who cares?
@@ -7712,9 +7706,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
break;
case MT_RING:
case MT_COIN:
-#ifdef BLUE_SPHERES
case MT_BLUEBALL:
-#endif
nummaprings++;
default:
break;
@@ -7840,9 +7832,7 @@ void P_RemoveMobj(mobj_t *mobj)
if (mobj->spawnpoint &&
(mobj->type == MT_RING
|| mobj->type == MT_COIN
-#ifdef BLUE_SPHERES
|| mobj->type == MT_BLUEBALL
-#endif
|| mobj->type == MT_REDTEAMRING
|| mobj->type == MT_BLUETEAMRING
|| P_WeaponOrPanel(mobj->type))
@@ -9628,11 +9618,9 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
ringthing = (gametype == GT_CTF) ? MT_BLUETEAMRING : MT_RING;
break;
default:
-#ifdef BLUE_SPHERES
// Spawn rings as blue spheres in special stages, ala S3+K.
if (G_IsSpecialStage(gamemap) && useNightsSS)
ringthing = MT_BLUEBALL;
-#endif
break;
}
@@ -9697,11 +9685,9 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
if (ultimatemode && !(G_IsSpecialStage(gamemap) || maptol & TOL_NIGHTS))
return;
-#ifdef BLUE_SPHERES
// Spawn rings as blue spheres in special stages, ala S3+K.
if (G_IsSpecialStage(gamemap) && useNightsSS)
ringthing = MT_BLUEBALL;
-#endif
for (r = 1; r <= 5; r++)
{
@@ -9752,11 +9738,9 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
if (ultimatemode && !(G_IsSpecialStage(gamemap) || maptol & TOL_NIGHTS))
return;
-#ifdef BLUE_SPHERES
// Spawn rings as blue spheres in special stages, ala S3+K.
if (G_IsSpecialStage(gamemap) && useNightsSS)
ringthing = MT_BLUEBALL;
-#endif
angle >>= ANGLETOFINESHIFT;
@@ -9849,11 +9833,9 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
if (ultimatemode && !(G_IsSpecialStage(gamemap) || (maptol & TOL_NIGHTS)))
continue;
-#ifdef BLUE_SPHERES
// Spawn rings as blue spheres in special stages, ala S3+K.
if (G_IsSpecialStage(gamemap) && useNightsSS)
itemToSpawn = MT_BLUEBALL;
-#endif
}
fa = i*FINEANGLES/numitems;
diff --git a/src/p_user.c b/src/p_user.c
index 4639372908d96354d2216134dd1228681894078b..03b2c1dd87a7a39a8a291277133db86eba4f34c2 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8857,10 +8857,7 @@ void P_PlayerThink(player_t *player)
mo2 = (mobj_t *)th;
if (!(mo2->type == MT_NIGHTSWING || mo2->type == MT_RING || mo2->type == MT_COIN
-#ifdef BLUE_SPHERES
- || mo2->type == MT_BLUEBALL
-#endif
- ))
+ || mo2->type == MT_BLUEBALL))
continue;
if (P_AproxDistance(P_AproxDistance(mo2->x - x, mo2->y - y), mo2->z - z) > FixedMul(128*FRACUNIT, player->mo->scale))