From aefbd8c58a831febf38a3248b717ef4aa5e73702 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 23 Jan 2024 00:38:45 -0800 Subject: [PATCH] Remove unused overhead WANTED code From v1 Battle --- src/deh_tables.c | 8 -------- src/info.c | 35 --------------------------------- src/info.h | 9 --------- src/p_mobj.c | 51 ------------------------------------------------ 4 files changed, 103 deletions(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index ea36c5ae0..5c9851172 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -4107,13 +4107,6 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_PLAYERARROW_ITEM", "S_PLAYERARROW_NUMBER", "S_PLAYERARROW_X", - "S_PLAYERARROW_WANTED1", - "S_PLAYERARROW_WANTED2", - "S_PLAYERARROW_WANTED3", - "S_PLAYERARROW_WANTED4", - "S_PLAYERARROW_WANTED5", - "S_PLAYERARROW_WANTED6", - "S_PLAYERARROW_WANTED7", "S_PLAYERBOMB1", // Player bomb overlay "S_PLAYERBOMB2", @@ -5975,7 +5968,6 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_GUARDBREAK", // Guard break "MT_PLAYERARROW", - "MT_PLAYERWANTED", "MT_KARMAHITBOX", "MT_KARMAWHEEL", diff --git a/src/info.c b/src/info.c index 0d6577ffc..0ba6fcf3e 100644 --- a/src/info.c +++ b/src/info.c @@ -726,7 +726,6 @@ char sprnames[NUMSPRITES + 1][5] = "ITMN", "PWRB", "RBOW", // power-up aura - "WANT", "PBOM", // player bomb @@ -4975,13 +4974,6 @@ state_t states[NUMSTATES] = {SPR_NULL, FF_FULLBRIGHT, -1, {NULL}, 0, 11, S_NULL}, // S_PLAYERARROW_ITEM {SPR_ITMN, FF_FULLBRIGHT, 2, {NULL}, 0, 11, S_NULL}, // S_PLAYERARROW_NUMBER {SPR_ITMN, FF_FULLBRIGHT|11, 2, {NULL}, 0, 11, S_NULL}, // S_PLAYERARROW_X - {SPR_WANT, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_PLAYERARROW_WANTED2}, // S_PLAYERARROW_WANTED1 - {SPR_WANT, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_PLAYERARROW_WANTED3}, // S_PLAYERARROW_WANTED2 - {SPR_WANT, FF_FULLBRIGHT|2, 3, {NULL}, 0, 0, S_PLAYERARROW_WANTED4}, // S_PLAYERARROW_WANTED3 - {SPR_WANT, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_PLAYERARROW_WANTED5}, // S_PLAYERARROW_WANTED4 - {SPR_WANT, FF_FULLBRIGHT|4, 3, {NULL}, 0, 0, S_PLAYERARROW_WANTED6}, // S_PLAYERARROW_WANTED5 - {SPR_WANT, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_PLAYERARROW_WANTED7}, // S_PLAYERARROW_WANTED6 - {SPR_WANT, FF_FULLBRIGHT|6, 3, {NULL}, 0, 0, S_PLAYERARROW_WANTED1}, // S_PLAYERARROW_WANTED7 {SPR_SPBM, 0, 1, {NULL}, 0, 0, S_PLAYERBOMB2}, // S_PLAYERBOMB1 {SPR_SPBM, 1, 1, {NULL}, 0, 0, S_PLAYERBOMB3}, // S_PLAYERBOMB2 @@ -27299,33 +27291,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_PLAYERWANTED - -1, // doomednum - S_PLAYERARROW_WANTED1, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 8, // speed - 36*FRACUNIT, // radius - 37*FRACUNIT, // height - -2, // display offset - 16, // mass - 0, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags - S_NULL // raisestate - }, - { // MT_KARMAHITBOX -1, // doomednum S_PLAYERBOMB1, // spawnstate diff --git a/src/info.h b/src/info.h index 09f34a692..4b405422e 100644 --- a/src/info.h +++ b/src/info.h @@ -1290,7 +1290,6 @@ typedef enum sprite SPR_ITMN, SPR_PWRB, SPR_RBOW, // power-up aura - SPR_WANT, SPR_PBOM, // player bomb @@ -5430,13 +5429,6 @@ typedef enum state S_PLAYERARROW_ITEM, S_PLAYERARROW_NUMBER, S_PLAYERARROW_X, - S_PLAYERARROW_WANTED1, - S_PLAYERARROW_WANTED2, - S_PLAYERARROW_WANTED3, - S_PLAYERARROW_WANTED4, - S_PLAYERARROW_WANTED5, - S_PLAYERARROW_WANTED6, - S_PLAYERARROW_WANTED7, S_PLAYERBOMB1, // Karma player overlays S_PLAYERBOMB2, @@ -7340,7 +7332,6 @@ typedef enum mobj_type MT_GUARDBREAK, MT_PLAYERARROW, - MT_PLAYERWANTED, MT_KARMAHITBOX, MT_KARMAWHEEL, diff --git a/src/p_mobj.c b/src/p_mobj.c index 0eee95abd..3f473e89e 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6630,57 +6630,6 @@ static void P_MobjSceneryThink(mobj_t *mobj) return; } break; - case MT_PLAYERWANTED: - if (mobj->target && mobj->target->health && mobj->tracer - && mobj->target->player && !mobj->target->player->spectator - && mobj->target->health && mobj->target->player->playerstate != PST_DEAD - && players[g_localplayers[0]].mo && !players[g_localplayers[0]].spectator) - { - fixed_t scale = 3*mobj->target->scale; - - if (!K_IsPlayerWanted(mobj->target->player)) - { - mobj->tracer->movecount = 0; - P_RemoveMobj(mobj); - return; - } - - if (mobj->tracer->renderflags & RF_DONTDRAW) - mobj->renderflags |= RF_DONTDRAW; - else - mobj->renderflags &= ~RF_DONTDRAW; - - P_UnsetThingPosition(mobj); - mobj->x = mobj->target->x; - mobj->y = mobj->target->y; - - if (!r_splitscreen && players[displayplayers[0]].mo) - { - scale = mobj->target->scale + FixedMul(FixedDiv(abs(P_AproxDistance(players[displayplayers[0]].mo->x-mobj->target->x, - players[displayplayers[0]].mo->y-mobj->target->y)), RING_DIST), mobj->target->scale); - if (scale > 16*mobj->target->scale) - scale = 16*mobj->target->scale; - } - mobj->destscale = scale; - - if (!(mobj->target->eflags & MFE_VERTICALFLIP)) - { - mobj->z = mobj->target->z + mobj->target->height + (16*mobj->target->scale) + (64*scale); - mobj->eflags &= ~MFE_VERTICALFLIP; - } - else - { - mobj->z = mobj->target->z - mobj->target->height - (16*mobj->target->scale) - (64*scale); - mobj->eflags |= MFE_VERTICALFLIP; - } - P_SetThingPosition(mobj); - } - else if (mobj->health > 0) - { - P_KillMobj(mobj, NULL, NULL, DMG_NORMAL); - return; - } - break; case MT_PETSMOKER: if (!(leveltime % 10)) {