From 99c0257f0228ca025ff3069e0eb34544e0dfeb2a Mon Sep 17 00:00:00 2001 From: NepDisk <16447892+NepDisk@users.noreply.github.com> Date: Sun, 29 Sep 2024 16:09:29 -0400 Subject: [PATCH] Remove screen flash and quake --- src/k_kart.c | 33 --------------------------------- src/k_kart.h | 1 - src/p_enemy.c | 2 -- 3 files changed, 36 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 9b23cd03e..220aebb0d 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3528,35 +3528,6 @@ void K_TakeBumpersFromPlayer(player_t *player, player_t *victim, UINT8 amount) K_HandleBumperChanges(victim, oldVictimBumpers); } -#define MINEQUAKEDIST 4096 - -// Does the proximity screen flash and quake for explosions -void K_MineFlashScreen(mobj_t *source) -{ - INT32 pnum; - player_t *p; - - // check for potential display players near the source so we can have a sick earthquake / flashpal. - for (pnum = 0; pnum < MAXPLAYERS; pnum++) - { - p = &players[pnum]; - - if (!playeringame[pnum] || !P_IsDisplayPlayer(p)) - continue; - - if (R_PointToDist2(p->mo->x, p->mo->y, source->x, source->y) < mapobjectscale*MINEQUAKEDIST) - { - P_StartQuake(55<mo, source)) - { - bombflashtimer = TICRATE*2; - P_FlashPal(p, PAL_WHITE, 1); - } - break; // we can break right now because quakes are global to all split players somehow. - } - } -} - // Spawns the purely visual explosion void K_SpawnMineExplosion(mobj_t *source, UINT8 color) { @@ -3566,8 +3537,6 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color) mobj_t *truc; INT32 speed, speed2; - //K_MineFlashScreen(source); - K_MatchGenericExtraFlags(smoldering, source); smoldering->tics = TICRATE*3; radius = source->radius>>FRACBITS; @@ -3639,8 +3608,6 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color) } } -#undef MINEQUAKEDIST - static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, INT32 flags2, fixed_t speed) { mobj_t *th; diff --git a/src/k_kart.h b/src/k_kart.h index 86e92335a..09940e70d 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -66,7 +66,6 @@ void K_DebtStingPlayer(player_t *player, mobj_t *source); void K_HandleBumperChanges(player_t *player, UINT8 prevBumpers); void K_DestroyBumpers(player_t *player, UINT8 amount); void K_TakeBumpersFromPlayer(player_t *player, player_t *victim, UINT8 amount); -void K_MineFlashScreen(mobj_t *source); void K_SpawnMineExplosion(mobj_t *source, UINT8 color); UINT16 K_DriftSparkColor(player_t *player, INT32 charge); void K_SpawnBoostTrail(player_t *player); diff --git a/src/p_enemy.c b/src/p_enemy.c index 9fac24345..1670264a9 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -13668,8 +13668,6 @@ void A_LandMineExplode(mobj_t *actor) if (actor->target && !P_MobjWasRemoved(actor->target)) colour = actor->target->color; - //K_MineFlashScreen(actor); - // Spawn smoke remains: smoldering = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SMOLDERING); P_SetScale(smoldering, actor->scale);