From 2364fb80a05e2c2272a2848fadde17fe7f94d372 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 23 Jan 2024 00:43:43 -0800 Subject: [PATCH] Battle: remove overhead arrows (physical object) Old shitty object from v1 that is about to be replaced by HUD tracking. :D --- src/deh_tables.c | 8 -- src/info.c | 35 -------- src/info.h | 9 -- src/k_hud.cpp | 1 - src/p_mobj.c | 209 ----------------------------------------------- 5 files changed, 262 deletions(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index 5c9851172..08b9e9125 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -4102,12 +4102,6 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_POWERCLASH", // Invinc/Grow no damage collide VFX "S_GUARDBREAK", // Guard break - "S_PLAYERARROW", // Above player arrow - "S_PLAYERARROW_BOX", - "S_PLAYERARROW_ITEM", - "S_PLAYERARROW_NUMBER", - "S_PLAYERARROW_X", - "S_PLAYERBOMB1", // Player bomb overlay "S_PLAYERBOMB2", "S_PLAYERBOMB3", @@ -5967,8 +5961,6 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_POWERCLASH", // Invinc/Grow no damage clash VFX "MT_GUARDBREAK", // Guard break - "MT_PLAYERARROW", - "MT_KARMAHITBOX", "MT_KARMAWHEEL", diff --git a/src/info.c b/src/info.c index 0ba6fcf3e..d12695ab3 100644 --- a/src/info.c +++ b/src/info.c @@ -719,7 +719,6 @@ char sprnames[NUMSPRITES + 1][5] = "PWCL", // Invinc/grow clash VFX "GBRK", // Guard break - "ARRO", // player arrows "ITEM", "ITMO", "ITMI", @@ -4968,13 +4967,6 @@ state_t states[NUMSTATES] = {SPR_PWCL, FF_FULLBRIGHT|FF_ANIMATE|FF_PAPERSPRITE, 10, {NULL}, 9, 1, S_NULL}, // S_POWERCLASH {SPR_GBRK, FF_ADD|FF_FULLBRIGHT|FF_ANIMATE|FF_PAPERSPRITE, 24, {NULL}, 5, 4, S_NULL}, // S_GUARDBREAK - // Above player arrow - {SPR_ARRO, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW - {SPR_ARRO, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW_BOX - {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_SPBM, 0, 1, {NULL}, 0, 0, S_PLAYERBOMB2}, // S_PLAYERBOMB1 {SPR_SPBM, 1, 1, {NULL}, 0, 0, S_PLAYERBOMB3}, // S_PLAYERBOMB2 {SPR_SPBM, 0, 1, {NULL}, 0, 0, S_PLAYERBOMB4}, // S_PLAYERBOMB3 @@ -27264,33 +27256,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_PLAYERARROW - -1, // doomednum - S_PLAYERARROW, // 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 4b405422e..e14b363d2 100644 --- a/src/info.h +++ b/src/info.h @@ -1283,7 +1283,6 @@ typedef enum sprite SPR_PWCL, // Invinc/grow clash VFX SPR_GBRK, // Guard break - SPR_ARRO, // player arrows SPR_ITEM, SPR_ITMO, SPR_ITMI, @@ -5424,12 +5423,6 @@ typedef enum state S_POWERCLASH, // Grow/Invinc clash VFX S_GUARDBREAK, - S_PLAYERARROW, // Above player arrow - S_PLAYERARROW_BOX, - S_PLAYERARROW_ITEM, - S_PLAYERARROW_NUMBER, - S_PLAYERARROW_X, - S_PLAYERBOMB1, // Karma player overlays S_PLAYERBOMB2, S_PLAYERBOMB3, @@ -7331,8 +7324,6 @@ typedef enum mobj_type MT_POWERCLASH, // Grow/Invinc clash VFX MT_GUARDBREAK, - MT_PLAYERARROW, - MT_KARMAHITBOX, MT_KARMAWHEEL, diff --git a/src/k_hud.cpp b/src/k_hud.cpp index b26548122..3fa62a007 100644 --- a/src/k_hud.cpp +++ b/src/k_hud.cpp @@ -1325,7 +1325,6 @@ void K_DrawLikeMapThumbnail(fixed_t x, fixed_t y, fixed_t width, UINT32 flags, p ); } -// see also MT_PLAYERARROW mobjthinker in p_mobj.c static void K_drawKartItem(void) { // ITEM_X = BASEVIDWIDTH-50; // 270 diff --git a/src/p_mobj.c b/src/p_mobj.c index 3f473e89e..0c377ca49 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6429,207 +6429,6 @@ static void P_MobjSceneryThink(mobj_t *mobj) } break; - // see also K_drawKartItem in k_hud.c - case MT_PLAYERARROW: // FIXME: Delete this object, attach to name tags instead. - if (mobj->target && mobj->target->health - && mobj->target->player && !mobj->target->player->spectator - && mobj->target->health && mobj->target->player->playerstate != PST_DEAD - /*&& players[displayplayers[0]].mo && !players[displayplayers[0]].spectator*/) - { - fixed_t scale = 3*mobj->target->scale; - mobj->color = mobj->target->color; - K_MatchGenericExtraFlags(mobj, mobj->target); - - if (!(gametyperules & GTR_BUMPERS) -#if 1 // Set to 0 to test without needing to host - || (P_IsDisplayPlayer(mobj->target->player)) -#endif - ) - mobj->renderflags |= RF_DONTDRAW; - - P_UnsetThingPosition(mobj); - mobj->x = mobj->target->x; - mobj->y = mobj->target->y; - - mobj->angle = R_PointToAngle(mobj->x, mobj->y) + ANGLE_90; // literally only happened because i wanted to ^L^R the SPR_ITEM's - - 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); - mobj->eflags &= ~MFE_VERTICALFLIP; - } - else - { - mobj->z = mobj->target->z - mobj->target->height - (16*mobj->target->scale); - mobj->eflags |= MFE_VERTICALFLIP; - } - P_SetThingPosition(mobj); - - if (!mobj->tracer) - { - mobj_t *overlay = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY); - P_SetTarget(&mobj->tracer, overlay); - P_SetTarget(&mobj->tracer->target, mobj); - P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM); - P_SetScale(mobj->tracer, (mobj->tracer->destscale = mobj->scale)); - } - - // Do this in an easy way - if (mobj->target->player->itemRoulette.active) - { - mobj->tracer->color = mobj->target->player->skincolor; - mobj->tracer->colorized = true; - } - else - { - mobj->tracer->color = SKINCOLOR_NONE; - mobj->tracer->colorized = false; - } - - if (!(mobj->renderflags & RF_DONTDRAW)) - { - //const INT32 numberdisplaymin = ((mobj->target->player->itemtype == KITEM_ORBINAUT) ? 5 : 2); - - // Set it to use the correct states for its condition - if (mobj->target->player->itemRoulette.active) - { - P_SetMobjState(mobj, S_PLAYERARROW_BOX); - mobj->tracer->sprite = SPR_ITEM; - mobj->tracer->frame = 1 | FF_FULLBRIGHT; - mobj->tracer->renderflags &= ~RF_DONTDRAW; - } - else if (mobj->target->player->stealingtimer < 0) - { - P_SetMobjState(mobj, S_PLAYERARROW_BOX); - mobj->tracer->sprite = SPR_ITEM; - mobj->tracer->frame = FF_FULLBRIGHT|KITEM_HYUDORO; - if (leveltime & 2) - mobj->tracer->renderflags &= ~RF_DONTDRAW; - else - mobj->tracer->renderflags |= RF_DONTDRAW; - } - else if ((mobj->target->player->stealingtimer > 0) && (leveltime & 2)) - { - P_SetMobjState(mobj, S_PLAYERARROW_BOX); - mobj->tracer->sprite = SPR_ITEM; - mobj->tracer->frame = FF_FULLBRIGHT|KITEM_HYUDORO; - mobj->tracer->renderflags &= ~RF_DONTDRAW; - } - else if (mobj->target->player->eggmanexplode > 1) - { - P_SetMobjState(mobj, S_PLAYERARROW_BOX); - mobj->tracer->sprite = SPR_ITEM; - mobj->tracer->frame = FF_FULLBRIGHT|KITEM_EGGMAN; - if (leveltime & 1) - mobj->tracer->renderflags &= ~RF_DONTDRAW; - else - mobj->tracer->renderflags |= RF_DONTDRAW; - } - else if (mobj->target->player->rocketsneakertimer > 1) - { - //itembar = mobj->target->player->rocketsneakertimer; -- not today satan - P_SetMobjState(mobj, S_PLAYERARROW_BOX); - mobj->tracer->sprite = SPR_ITEM; - mobj->tracer->frame = FF_FULLBRIGHT|KITEM_ROCKETSNEAKER; - if (leveltime & 1) - mobj->tracer->renderflags &= ~RF_DONTDRAW; - else - mobj->tracer->renderflags |= RF_DONTDRAW; - } - else if (mobj->target->player->itemtype && mobj->target->player->itemamount > 0) - { - P_SetMobjState(mobj, S_PLAYERARROW_BOX); - - switch (mobj->target->player->itemtype) - { - case KITEM_ORBINAUT: - mobj->tracer->sprite = SPR_ITMO; - mobj->tracer->frame = FF_FULLBRIGHT|K_GetOrbinautItemFrame(mobj->target->player->itemamount); - break; - case KITEM_INVINCIBILITY: - mobj->tracer->sprite = SPR_ITMI; - mobj->tracer->frame = FF_FULLBRIGHT|K_GetInvincibilityItemFrame(); - break; - case KITEM_SAD: - mobj->tracer->sprite = SPR_ITEM; - mobj->tracer->frame = FF_FULLBRIGHT; - break; - default: - mobj->tracer->sprite = SPR_ITEM; - mobj->tracer->frame = FF_FULLBRIGHT|(mobj->target->player->itemtype); - break; - } - - if (mobj->target->player->itemflags & IF_ITEMOUT) - { - if (leveltime & 1) - mobj->tracer->renderflags &= ~RF_DONTDRAW; - else - mobj->tracer->renderflags |= RF_DONTDRAW; - } - else - mobj->tracer->renderflags &= ~RF_DONTDRAW; - } - else - { - P_SetMobjState(mobj, S_PLAYERARROW); - P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM); - } - - mobj->tracer->destscale = scale; - -#if 0 - if (mobj->target->player->itemamount >= numberdisplaymin - && mobj->target->player->itemamount <= 10) // Meh, too difficult to support greater than this; convert this to a decent HUD object and then maybe :V - { - mobj_t *number = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY); - mobj_t *numx = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY); - - P_SetTarget(&number->target, mobj); - P_SetMobjState(number, S_PLAYERARROW_NUMBER); - P_SetScale(number, mobj->scale); - number->destscale = scale; - number->frame = FF_FULLBRIGHT|(mobj->target->player->itemamount); - - P_SetTarget(&numx->target, mobj); - P_SetMobjState(numx, S_PLAYERARROW_X); - P_SetScale(numx, mobj->scale); - numx->destscale = scale; - } -#endif - -#if 0 - if (K_IsPlayerWanted(mobj->target->player) && mobj->movecount != 1) - { - mobj_t *wanted = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_PLAYERWANTED); - P_SetTarget(&wanted->target, mobj->target); - P_SetTarget(&wanted->tracer, mobj); - P_SetScale(wanted, mobj->scale); - wanted->destscale = scale; - mobj->movecount = 1; - } - else if (!K_IsPlayerWanted(mobj->target->player)) -#endif - mobj->movecount = 0; - } - else - mobj->tracer->renderflags |= RF_DONTDRAW; - } - else if (mobj->health > 0) - { - P_KillMobj(mobj, NULL, NULL, DMG_NORMAL); - return; - } - break; case MT_PETSMOKER: if (!(leveltime % 10)) { @@ -12921,14 +12720,6 @@ void P_SpawnPlayer(INT32 playernum) K_InitWavedashIndicator(p); K_InitTrickIndicator(p); - if (gametyperules & GTR_ITEMARROWS) - { - mobj_t *overheadarrow = P_SpawnMobj(mobj->x, mobj->y, mobj->z + mobj->height + 16*FRACUNIT, MT_PLAYERARROW); - P_SetTarget(&overheadarrow->target, mobj); - overheadarrow->renderflags |= RF_DONTDRAW; - P_SetScale(overheadarrow, mobj->destscale); - } - if ((gametyperules & GTR_BUMPERS) && !p->spectator) { mobj->health = K_BumpersToHealth(K_StartingBumperCount());