From 1823286c24fd36f7ea918e44b94957c030cab424 Mon Sep 17 00:00:00 2001 From: NepDisk <16447892+NepDisk@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:33:43 -0400 Subject: [PATCH] Remove Debt spkie object --- src/deh_tables.c | 17 ----------------- src/info.c | 44 -------------------------------------------- src/info.h | 17 ----------------- src/p_inter.c | 5 ----- src/p_mobj.c | 12 ------------ 5 files changed, 95 deletions(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index 2797bd15b..23276e114 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -4389,22 +4389,6 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_WATERTRAILUNDERLAY6", "S_WATERTRAILUNDERLAY7", "S_WATERTRAILUNDERLAY8", - - // Funny Spike - "S_DEBTSPIKE1", - "S_DEBTSPIKE2", - "S_DEBTSPIKE3", - "S_DEBTSPIKE4", - "S_DEBTSPIKE5", - "S_DEBTSPIKE6", - "S_DEBTSPIKE7", - "S_DEBTSPIKE8", - "S_DEBTSPIKE9", - "S_DEBTSPIKEA", - "S_DEBTSPIKEB", - "S_DEBTSPIKEC", - "S_DEBTSPIKED", - "S_DEBTSPIKEE", }; // RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1", @@ -4526,7 +4510,6 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t // Collectible Items "MT_RING", "MT_FLINGRING", // Lost ring - "MT_DEBTSPIKE", // Ring debt funny spike "MT_BLUESPHERE", // Blue sphere for special stages "MT_FLINGBLUESPHERE", // Lost blue sphere "MT_BOMBSPHERE", diff --git a/src/info.c b/src/info.c index 115b9bdfc..f43cd6a4e 100644 --- a/src/info.c +++ b/src/info.c @@ -134,7 +134,6 @@ char sprnames[NUMSPRITES + 1][5] = // Collectible Items "RING", - "DEBT", "TRNG", // Team Rings "TOKE", // Special Stage Token "RFLG", // Red CTF Flag @@ -4958,22 +4957,6 @@ state_t states[NUMSTATES] = {SPR_WTRL, FF_TRANS50|FF_PAPERSPRITE|13, 2, {NULL}, 0, 0, S_NULL}, // S_WATERTRAILUNDERLAY6 {SPR_WTRL, FF_TRANS50|FF_PAPERSPRITE|14, 2, {NULL}, 0, 0, S_NULL}, // S_WATERTRAILUNDERLAY7 {SPR_WTRL, FF_TRANS50|FF_PAPERSPRITE|15, 2, {NULL}, 0, 0, S_NULL}, // S_WATERTRAILUNDERLAY8 - - // Funny Spike - {SPR_DEBT, 0|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE2}, // S_DEBTSPIKE1 - {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE3}, // S_DEBTSPIKE2 - {SPR_DEBT, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE4}, // S_DEBTSPIKE3 - {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE5}, // S_DEBTSPIKE4 - {SPR_DEBT, 2|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE6}, // S_DEBTSPIKE5 - {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE7}, // S_DEBTSPIKE6 - {SPR_DEBT, 3|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE8}, // S_DEBTSPIKE7 - {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE9}, // S_DEBTSPIKE8 - {SPR_DEBT, 4|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKEA}, // S_DEBTSPIKE9 - {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKEB}, // S_DEBTSPIKEA - {SPR_DEBT, 5|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKEC}, // S_DEBTSPIKEB - {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKED}, // S_DEBTSPIKEC - {SPR_DEBT, 6|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKEE}, // S_DEBTSPIKED - {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE1}, // S_DEBTSPIKEE }; mobjinfo_t mobjinfo[NUMMOBJTYPES] = @@ -7569,33 +7552,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_DEBTSPIKE - -1, // doomednum - S_DEBTSPIKE1, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 0, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_SPRK1, // deathstate - S_NULL, // xdeathstate - sfx_itemup, // deathsound - 38*FRACUNIT, // speed - 24*FRACUNIT, // radius - 48*FRACUNIT, // height - 0, // display offset - 100, // mass - 0, // damage - sfx_None, // activesound - MF_DONTENCOREMAP, // flags - S_NULL // raisestate - }, - { // MT_BLUESPHERE -1, // doomednum S_BLUESPHERE_SPAWN, // spawnstate diff --git a/src/info.h b/src/info.h index 679f625da..ba7591ce7 100644 --- a/src/info.h +++ b/src/info.h @@ -685,7 +685,6 @@ typedef enum sprite // Collectible Items SPR_RING, - SPR_DEBT, SPR_TRNG, // Team Rings SPR_TOKE, // Special Stage Token SPR_RFLG, // Red CTF Flag @@ -5386,21 +5385,6 @@ typedef enum state S_WATERTRAILUNDERLAY7, S_WATERTRAILUNDERLAY8, - S_DEBTSPIKE1, - S_DEBTSPIKE2, - S_DEBTSPIKE3, - S_DEBTSPIKE4, - S_DEBTSPIKE5, - S_DEBTSPIKE6, - S_DEBTSPIKE7, - S_DEBTSPIKE8, - S_DEBTSPIKE9, - S_DEBTSPIKEA, - S_DEBTSPIKEB, - S_DEBTSPIKEC, - S_DEBTSPIKED, - S_DEBTSPIKEE, - S_FIRSTFREESLOT, S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1, NUMSTATES @@ -5541,7 +5525,6 @@ typedef enum mobj_type // Collectible Items MT_RING, MT_FLINGRING, // Lost ring - MT_DEBTSPIKE, // Ring debt funny spike MT_BLUESPHERE, // Blue sphere for special stages MT_FLINGBLUESPHERE, // Lost blue sphere MT_BOMBSPHERE, diff --git a/src/p_inter.c b/src/p_inter.c index c5035022b..0d3ff964f 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2352,9 +2352,4 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings) { P_FlingBurst(player, fa, MT_FLINGRING, 60*TICRATE, FRACUNIT, i); } - - while (i < num_rings) - { - P_FlingBurst(player, fa, MT_DEBTSPIKE, 0, 3 * FRACUNIT / 2, i++); - } } diff --git a/src/p_mobj.c b/src/p_mobj.c index 787d3e09c..6f413621b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -2402,11 +2402,6 @@ boolean P_ZMovement(mobj_t *mo) mom.z = P_MobjFlip(mo)*FixedMul(5*FRACUNIT, mo->scale); else if (mo->type == MT_SPINFIRE) // elemental shield fire is another exception here ; - else if (mo->type == MT_DEBTSPIKE) - { - mom.x = mom.y = 0; - mom.z = -mom.z/2; - } else if (mo->flags & MF_MISSILE) { if (!(mo->flags & MF_NOCLIP)) @@ -6732,12 +6727,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj) else A_AttractChase(mobj); break; - case MT_DEBTSPIKE: - if (mobj->fuse == 0 && P_GetMobjFeet(mobj) == P_GetMobjGround(mobj)) - { - mobj->fuse = 90; - } - break; case MT_EMBLEM: if (mobj->flags2 & MF2_NIGHTSPULL) P_NightsItemChase(mobj); @@ -9390,7 +9379,6 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) break; case MT_RING: case MT_FLINGRING: - case MT_DEBTSPIKE: case MT_FLOATINGITEM: case MT_BLUESPHERE: case MT_EMERALD: