From a5b76597eb4fe8e86abcd2d6ca05a88940c693e4 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Tue, 17 Dec 2024 10:29:53 -0500 Subject: [PATCH] Remove Shpereboxes --- src/deh_tables.c | 28 ------------------------ src/info.c | 55 ------------------------------------------------ src/info.h | 29 ------------------------- src/k_battle.c | 29 ------------------------- src/k_battle.h | 1 - src/p_enemy.c | 5 +---- src/p_inter.c | 8 ------- src/p_mobj.c | 1 - 8 files changed, 1 insertion(+), 155 deletions(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index 1ce1e7457..37bb4cb29 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -3508,33 +3508,6 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_RANDOMITEM24", "S_DEADRANDOMITEM", - // Sphere Box (for Battle) - "S_SPHEREBOX1", - "S_SPHEREBOX2", - "S_SPHEREBOX3", - "S_SPHEREBOX4", - "S_SPHEREBOX5", - "S_SPHEREBOX6", - "S_SPHEREBOX7", - "S_SPHEREBOX8", - "S_SPHEREBOX9", - "S_SPHEREBOX10", - "S_SPHEREBOX11", - "S_SPHEREBOX12", - "S_SPHEREBOX13", - "S_SPHEREBOX14", - "S_SPHEREBOX15", - "S_SPHEREBOX16", - "S_SPHEREBOX17", - "S_SPHEREBOX18", - "S_SPHEREBOX19", - "S_SPHEREBOX20", - "S_SPHEREBOX21", - "S_SPHEREBOX22", - "S_SPHEREBOX23", - "S_SPHEREBOX24", - "S_DEADSPHEREBOX", - // Random Item Pop "S_RANDOMITEMPOP1", "S_RANDOMITEMPOP2", @@ -5368,7 +5341,6 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t // SRB2kart "MT_RANDOMITEM", - "MT_SPHEREBOX", "MT_RANDOMITEMPOP", "MT_FLOATINGITEM", "MT_ITEMCAPSULE", diff --git a/src/info.c b/src/info.c index 04a3b2909..45b4ec7d8 100644 --- a/src/info.c +++ b/src/info.c @@ -522,7 +522,6 @@ char sprnames[NUMSPRITES + 1][5] = //SRB2kart Sprites (sort later) "RNDM", // Random Item Box - "SBOX", // Sphere Box (for Battle) "RPOP", // Random Item Box Pop "SGNS", // Signpost sparkle "FAST", // Speed boost trail @@ -4071,33 +4070,6 @@ state_t states[NUMSTATES] = {SPR_RNDM, 23|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM1}, // S_RANDOMITEM24 {SPR_RNDM, 0|FF_FULLBRIGHT, 1, {A_ItemPop}, 0, 0, S_NULL}, // S_DEADRANDOMITEM - {SPR_SBOX, 0|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX2}, // S_SPHEREBOX1 - {SPR_SBOX, 1|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX3}, // S_SPHEREBOX2 - {SPR_SBOX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX4}, // S_SPHEREBOX3 - {SPR_SBOX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX5}, // S_SPHEREBOX4 - {SPR_SBOX, 4|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX6}, // S_SPHEREBOX5 - {SPR_SBOX, 5|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX7}, // S_SPHEREBOX6 - {SPR_SBOX, 6|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX8}, // S_SPHEREBOX7 - {SPR_SBOX, 7|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX9}, // S_SPHEREBOX8 - {SPR_SBOX, 8|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX10}, // S_SPHEREBOX9 - {SPR_SBOX, 9|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX11}, // S_SPHEREBOX10 - {SPR_SBOX, 10|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX12}, // S_SPHEREBOX11 - {SPR_SBOX, 11|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX13}, // S_SPHEREBOX12 - {SPR_SBOX, 12|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX14}, // S_SPHEREBOX13 - {SPR_SBOX, 13|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX15}, // S_SPHEREBOX14 - {SPR_SBOX, 14|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX16}, // S_SPHEREBOX15 - {SPR_SBOX, 15|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX17}, // S_SPHEREBOX16 - {SPR_SBOX, 16|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX18}, // S_SPHEREBOX17 - {SPR_SBOX, 17|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX19}, // S_SPHEREBOX18 - {SPR_SBOX, 18|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX20}, // S_SPHEREBOX19 - {SPR_SBOX, 19|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX21}, // S_SPHEREBOX20 - {SPR_SBOX, 20|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX22}, // S_SPHEREBOX21 - {SPR_SBOX, 21|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX23}, // S_SPHEREBOX22 - {SPR_SBOX, 22|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX24}, // S_SPHEREBOX23 - {SPR_SBOX, 23|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX1}, // S_SPHEREBOX24 - {SPR_SBOX, 0|FF_FULLBRIGHT, 1, {A_ItemPop}, 1, 0, S_NULL}, // S_DEADSPHEREBOX - - {SPR_RPOP, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_RANDOMITEMPOP2}, // S_RANDOMITEMPOP1 {SPR_RPOP, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_RANDOMITEMPOP3}, // S_RANDOMITEMPOP2 {SPR_RPOP, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_RANDOMITEMPOP4}, // S_RANDOMITEMPOP3 @@ -22772,33 +22744,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_SPHEREBOX - -1, // doomednum - S_SPHEREBOX1, // 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_DEADSPHEREBOX, // deathstate - S_NULL, // xdeathstate - sfx_kc2e, // deathsound - 60*FRACUNIT, // speed - 48*FRACUNIT, // radius - 48*FRACUNIT, // height - 0, // display offset - 100, // mass - MT_RANDOMITEMPOP, // damage - sfx_None, // activesound - MF_SLIDEME|MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags - S_NULL // raisestate - }, - { // MT_RANDOMITEMPOP -1, // doomednum S_INVISIBLE, // spawnstate diff --git a/src/info.h b/src/info.h index 7cad130ba..885061a19 100644 --- a/src/info.h +++ b/src/info.h @@ -1077,7 +1077,6 @@ typedef enum sprite // SRB2Kart SPR_RNDM, // Random Item Box - SPR_SBOX, // Sphere Box (for Battle) SPR_RPOP, // Random Item Box Pop SPR_SGNS, // Signpost sparkle SPR_FAST, // Speed boost trail @@ -4475,33 +4474,6 @@ typedef enum state S_RANDOMITEM24, S_DEADRANDOMITEM, - // Sphere Box (for Battle) - S_SPHEREBOX1, - S_SPHEREBOX2, - S_SPHEREBOX3, - S_SPHEREBOX4, - S_SPHEREBOX5, - S_SPHEREBOX6, - S_SPHEREBOX7, - S_SPHEREBOX8, - S_SPHEREBOX9, - S_SPHEREBOX10, - S_SPHEREBOX11, - S_SPHEREBOX12, - S_SPHEREBOX13, - S_SPHEREBOX14, - S_SPHEREBOX15, - S_SPHEREBOX16, - S_SPHEREBOX17, - S_SPHEREBOX18, - S_SPHEREBOX19, - S_SPHEREBOX20, - S_SPHEREBOX21, - S_SPHEREBOX22, - S_SPHEREBOX23, - S_SPHEREBOX24, - S_DEADSPHEREBOX, - // Random Item Pop S_RANDOMITEMPOP1, S_RANDOMITEMPOP2, @@ -6376,7 +6348,6 @@ typedef enum mobj_type // SRB2kart MT_RANDOMITEM, - MT_SPHEREBOX, MT_RANDOMITEMPOP, MT_FLOATINGITEM, MT_ITEMCAPSULE, diff --git a/src/k_battle.c b/src/k_battle.c index 1098bc88b..d5a5d03d0 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -179,26 +179,6 @@ void K_CheckBumpers(void) } } -mobj_t *K_SpawnSphereBox(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT8 flip, UINT8 amount) -{ - mobj_t *drop = P_SpawnMobj(x, y, z, MT_SPHEREBOX); - - drop->angle = angle; - P_Thrust(drop, - FixedAngle(P_RandomFixed() * 180) + angle, - P_RandomRange(4, 12) * mapobjectscale); - - drop->momz = flip * 12 * mapobjectscale; - if (drop->eflags & MFE_UNDERWATER) - drop->momz = (117 * drop->momz) / 200; - - drop->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT); - - drop->extravalue1 = amount; - - return drop; -} - UINT8 K_NumEmeralds(player_t *player) { UINT8 i; @@ -326,15 +306,6 @@ void K_RunPaperItemSpawners(void) flip = P_MobjFlip(spotList[r]); { - if (gametyperules & GTR_SPHERES) - { - drop = K_SpawnSphereBox( - spotList[r]->x, spotList[r]->y, spotList[r]->z + (128 * mapobjectscale * flip), - FixedAngle(P_RandomRange(0, 359) * FRACUNIT), flip, - 10 - ); - K_FlipFromObject(drop, spotList[r]); - } drop = K_CreatePaperItem( spotList[r]->x, spotList[r]->y, spotList[r]->z + (128 * mapobjectscale * flip), diff --git a/src/k_battle.h b/src/k_battle.h index 55dd5940a..b2c8e3df1 100644 --- a/src/k_battle.h +++ b/src/k_battle.h @@ -17,7 +17,6 @@ boolean K_IsPlayerWanted(player_t *player); #define K_CalculateBattleWanted() (void)0 // not nulled out so we know where we need to recalculate some other form of battle mode importance void K_SpawnBattlePoints(player_t *source, player_t *victim, UINT8 amount); void K_CheckBumpers(void); -mobj_t *K_SpawnSphereBox(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT8 flip, UINT8 amount); UINT8 K_NumEmeralds(player_t *player); void K_RunPaperItemSpawners(void); void K_SpawnPlayerBattleBumpers(player_t *p); diff --git a/src/p_enemy.c b/src/p_enemy.c index 9ec8d27fc..132b18d1d 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -13212,7 +13212,6 @@ void A_ChangeHeight(mobj_t *actor) void A_ItemPop(mobj_t *actor) { - INT32 locvar1 = var1; mobj_t *remains; mobjtype_t explode; @@ -13278,9 +13277,7 @@ void A_ItemPop(mobj_t *actor) if (actor->info->deathsound) S_StartSound(remains, actor->info->deathsound); - if (locvar1 == 1) - P_GivePlayerSpheres(actor->target->player, actor->extravalue1); - else if (locvar1 == 0) + if (!((gametyperules & GTR_BUMPERS) && actor->target->player->bumper <= 0)) actor->target->player->itemroulette = 1; remains->flags2 &= ~MF2_AMBUSH; diff --git a/src/p_inter.c b/src/p_inter.c index 93065afdf..fc701652f 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -280,14 +280,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) if (!P_CanPickupItem(player, 1)) return; - special->momx = special->momy = special->momz = 0; - P_SetTarget(&special->target, toucher); - P_KillMobj(special, toucher, toucher, DMG_NORMAL); - break; - case MT_SPHEREBOX: - if (!P_CanPickupItem(player, 0)) - return; - special->momx = special->momy = special->momz = 0; P_SetTarget(&special->target, toucher); P_KillMobj(special, toucher, toucher, DMG_NORMAL); diff --git a/src/p_mobj.c b/src/p_mobj.c index bf9615d6a..47ad8317b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9080,7 +9080,6 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) thing->shadowscale = 12*FRACUNIT/5; break; case MT_RANDOMITEM: - case MT_SPHEREBOX: thing->shadowscale = FRACUNIT/2; thing->whiteshadow = false; break;