From ee7f3d71082c08bf240a65b38273bc105a7c802e Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 13 Nov 2023 19:52:58 -0800 Subject: [PATCH] Replace K_ReduceVFX with K_ReduceVFXForEveryone, replace owner cases with RF_REDUCEVFX --- src/k_hitlag.c | 2 +- src/k_kart.c | 57 ++++++++++++++++++++++++++------------------- src/k_kart.h | 2 +- src/k_terrain.c | 3 ++- src/objects/broly.c | 2 +- src/objects/ufo.c | 3 ++- src/p_enemy.c | 3 ++- src/p_map.c | 3 ++- src/p_mobj.c | 9 ++++--- src/p_user.c | 3 ++- 10 files changed, 52 insertions(+), 35 deletions(-) diff --git a/src/k_hitlag.c b/src/k_hitlag.c index 4bb0d37f3..3f1a3afad 100644 --- a/src/k_hitlag.c +++ b/src/k_hitlag.c @@ -126,7 +126,7 @@ static void K_SpawnSingleHitLagSpark( spark->colorized = true; } - K_ReduceVFX(spark, NULL); + K_ReduceVFXForEveryone(spark); } } diff --git a/src/k_kart.c b/src/k_kart.c index cc6137a2b..a40d64e05 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -316,7 +316,7 @@ UINT32 K_GetPlayerDontDrawFlag(player_t *player) return flag; } -void K_ReduceVFX(mobj_t *mo, player_t *owner) +void K_ReduceVFXForEveryone(mobj_t *mo) { if (cv_reducevfx.value == 0) { @@ -325,11 +325,6 @@ void K_ReduceVFX(mobj_t *mo, player_t *owner) } mo->renderflags |= RF_DONTDRAW; - - if (owner != NULL) - { - mo->renderflags &= ~K_GetPlayerDontDrawFlag(owner); - } } // Angle reflection used by springs & speed pads @@ -1713,7 +1708,8 @@ spawn_brake_dust P_SetScale(spark, (spark->destscale = FixedMul(scale, spark->scale))); - K_ReduceVFX(spark, master->player); + P_SetTarget(&spark->owner, master); + spark->renderflags |= RF_REDUCEVFX; } static void K_SpawnBrakeVisuals(player_t *player) @@ -1790,7 +1786,8 @@ void K_SpawnDriftBoostClip(player_t *player) P_RandomFlip(P_RandomRange(PR_DECORATION, FRACUNIT/2, FRACUNIT)), FixedMul(scale, player->speed)); - K_ReduceVFX(clip, player); + P_SetTarget(&clip->owner, player->mo); + clip->renderflags |= RF_REDUCEVFX; } void K_SpawnDriftBoostClipSpark(mobj_t *clip) @@ -1847,7 +1844,8 @@ static void K_SpawnGenericSpeedLines(player_t *player, boolean top) } K_MatchGenericExtraFlags(fast, player->mo); - K_ReduceVFX(fast, player); + P_SetTarget(&fast->owner, player->mo); + fast->renderflags |= RF_REDUCEVFX; if (top) { @@ -1926,7 +1924,8 @@ void K_SpawnInvincibilitySpeedLines(mobj_t *mo) fast->momz = 3*P_GetMobjZMovement(mo)/4; K_MatchGenericExtraFlags(fast, mo); - K_ReduceVFX(fast, mo->player); + P_SetTarget(&fast->owner, mo); + fast->renderflags |= RF_REDUCEVFX; fast->color = mo->color; fast->colorized = true; @@ -3040,7 +3039,8 @@ void K_SpawnWaterRunParticles(mobj_t *mobj) water->momz = mobj->momz; P_SetScale(water, trailScale); P_SetMobjState(water, curUnderlayFrame); - K_ReduceVFX(water, mobj->player); + P_SetTarget(&water->owner, mobj); + water->renderflags |= RF_REDUCEVFX; // overlay water = P_SpawnMobj(x1, y1, @@ -3052,7 +3052,8 @@ void K_SpawnWaterRunParticles(mobj_t *mobj) water->momz = mobj->momz; P_SetScale(water, trailScale); P_SetMobjState(water, curOverlayFrame); - K_ReduceVFX(water, mobj->player); + P_SetTarget(&water->owner, mobj); + water->renderflags |= RF_REDUCEVFX; // Right // Underlay @@ -3065,7 +3066,8 @@ void K_SpawnWaterRunParticles(mobj_t *mobj) water->momz = mobj->momz; P_SetScale(water, trailScale); P_SetMobjState(water, curUnderlayFrame); - K_ReduceVFX(water, mobj->player); + P_SetTarget(&water->owner, mobj); + water->renderflags |= RF_REDUCEVFX; // Overlay water = P_SpawnMobj(x2, y2, @@ -3077,7 +3079,8 @@ void K_SpawnWaterRunParticles(mobj_t *mobj) water->momz = mobj->momz; P_SetScale(water, trailScale); P_SetMobjState(water, curOverlayFrame); - K_ReduceVFX(water, mobj->player); + P_SetTarget(&water->owner, mobj); + water->renderflags |= RF_REDUCEVFX; if (!S_SoundPlaying(mobj, sfx_s3kdbs)) { @@ -5078,7 +5081,8 @@ static void K_SpawnDriftElectricity(player_t *player) spark->momz = mo->momz; spark->color = color; K_GenericExtraFlagsNoZAdjust(spark, mo); - K_ReduceVFX(spark, player); + P_SetTarget(&spark->owner, mo); + spark->renderflags |= RF_REDUCEVFX; spark->spritexscale += scalefactor/3; spark->spriteyscale += scalefactor/8; @@ -5128,7 +5132,8 @@ void K_SpawnDriftElectricSparks(player_t *player, int color, boolean shockwave) spark->frame |= FF_ADD; sparkangle += ANGLE_90; - K_ReduceVFX(spark, player); + P_SetTarget(&spark->owner, mo); + spark->renderflags |= RF_REDUCEVFX; } } } @@ -5279,7 +5284,8 @@ static void K_SpawnDriftSparks(player_t *player) spark->tics += trail; K_MatchGenericExtraFlags(spark, player->mo); - K_ReduceVFX(spark, player); + P_SetTarget(&spark->owner, player->mo); + spark->renderflags |= RF_REDUCEVFX; } if (player->driftcharge >= dsthree) @@ -10355,7 +10361,8 @@ void K_KartEbrakeVisuals(player_t *p) wave = P_SpawnMobj(p->mo->x, p->mo->y, p->mo->floorz, MT_SOFTLANDING); P_InstaScale(wave, p->mo->scale); P_SetTarget(&wave->target, p->mo); - K_ReduceVFX(wave, p); + P_SetTarget(&wave->owner, p->mo); + wave->renderflags |= RF_REDUCEVFX; } // sound @@ -10388,7 +10395,8 @@ void K_KartEbrakeVisuals(player_t *p) p->mo->hprev->angle = p->mo->angle; p->mo->hprev->fuse = TICRATE/2; // When we leave spindash for any reason, make sure this bubble goes away soon after. K_FlipFromObject(p->mo->hprev, p->mo); - K_ReduceVFX(p->mo->hprev, p); + P_SetTarget(&p->mo->hprev->owner, p->mo); + p->mo->hprev->renderflags |= RF_REDUCEVFX; p->mo->hprev->sprzoff = p->mo->sprzoff; p->mo->hprev->colorized = false; @@ -10406,7 +10414,8 @@ void K_KartEbrakeVisuals(player_t *p) spdl->colorized = true; spdl->color = SKINCOLOR_WHITE; K_MatchGenericExtraFlags(spdl, p->mo); - K_ReduceVFX(spdl, p); + P_SetTarget(&spdl->owner, p->mo); + spdl->renderflags |= RF_REDUCEVFX; P_SetScale(spdl, p->mo->scale); // squish the player a little bit. @@ -10525,8 +10534,6 @@ static void K_KartSpindashDust(mobj_t *parent) dust->momx = FixedMul(hmomentum, FINECOSINE(ang >> ANGLETOFINESHIFT)); dust->momy = FixedMul(hmomentum, FINESINE(ang >> ANGLETOFINESHIFT)); dust->momz = vmomentum * flip; - - //K_ReduceVFX(dust, parent->player); } } @@ -10554,7 +10561,8 @@ static void K_KartSpindashWind(mobj_t *parent) wind->momz = 3 * P_GetMobjZMovement(parent) / 4; K_MatchGenericExtraFlags(wind, parent); - K_ReduceVFX(wind, parent->player); + P_SetTarget(&wind->owner, parent); + wind->renderflags |= RF_REDUCEVFX; } // Time after which you get a thrust for releasing spindash @@ -12623,7 +12631,8 @@ void K_SetTireGrease(player_t *player, tic_t tics) P_SetTarget(&grease->target, player->mo); grease->angle = K_MomentumAngle(player->mo); grease->extravalue1 = i; - K_ReduceVFX(grease, player); + P_SetTarget(&grease->owner, player->mo); + grease->renderflags |= RF_REDUCEVFX; } } diff --git a/src/k_kart.h b/src/k_kart.h index 7b3d6d62c..12ba902cd 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -67,7 +67,7 @@ void K_TimerReset(void); void K_TimerInit(void); UINT32 K_GetPlayerDontDrawFlag(player_t *player); -void K_ReduceVFX(mobj_t *mo, player_t *owner); +void K_ReduceVFXForEveryone(mobj_t *mo); boolean K_IsPlayerLosing(player_t *player); fixed_t K_GetKartGameSpeedScalar(SINT8 value); diff --git a/src/k_terrain.c b/src/k_terrain.c index 36edb5261..471c389e4 100644 --- a/src/k_terrain.c +++ b/src/k_terrain.c @@ -630,7 +630,8 @@ void K_ProcessTerrainEffect(mobj_t *mo) spark->fuse = 9; spark->cusval = K_StairJankFlip(ANGLE_90); P_SetTarget(&spark->target, mo); - K_ReduceVFX(spark, player); + P_SetTarget(&spark->owner, mo); + spark->renderflags |= RF_REDUCEVFX; } player->stairjank = 17; diff --git a/src/objects/broly.c b/src/objects/broly.c index f67847ad1..2419fac10 100644 --- a/src/objects/broly.c +++ b/src/objects/broly.c @@ -51,7 +51,7 @@ Obj_SpawnBrolyKi x->tics = (duration + BUFFER_TICS); - K_ReduceVFX(x, NULL); + K_ReduceVFXForEveryone(x); S_StartSound(x, sfx_cdfm74); diff --git a/src/objects/ufo.c b/src/objects/ufo.c index 7ad363775..3ed9614f4 100644 --- a/src/objects/ufo.c +++ b/src/objects/ufo.c @@ -112,7 +112,8 @@ static void SpawnEmeraldSpeedLines(mobj_t *mo) fast->momz = 3*P_GetMobjZMovement(mo)/4; K_MatchGenericExtraFlags(fast, mo); - K_ReduceVFX(fast, mo->player); + P_SetTarget(&fast->owner, mo); + fast->renderflags |= RF_REDUCEVFX; fast->color = mo->color; fast->colorized = true; diff --git a/src/p_enemy.c b/src/p_enemy.c index 2f7700a30..f76bf88b7 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3828,7 +3828,8 @@ void A_AttractChase(mobj_t *actor) P_SetTarget(&sparkle->target, actor->target); sparkle->angle = (actor->target->angle + (offset>>1)) + (offset * actor->target->player->sparkleanim); actor->target->player->sparkleanim = (actor->target->player->sparkleanim+1) % 20; - K_ReduceVFX(sparkle, actor->target->player); + P_SetTarget(&sparkle->owner, actor->target); + sparkle->renderflags |= RF_REDUCEVFX; P_KillMobj(actor, actor->target, actor->target, DMG_NORMAL); return; diff --git a/src/p_map.c b/src/p_map.c index 9888c23c3..21b9f354b 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -3177,7 +3177,8 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff, Try spark->fuse = 9; spark->cusval = K_StairJankFlip(ANGLE_90); P_SetTarget(&spark->target, thing); - K_ReduceVFX(spark, thing->player); + P_SetTarget(&spark->owner, thing); + spark->renderflags |= RF_REDUCEVFX; } thing->player->stairjank = 17; diff --git a/src/p_mobj.c b/src/p_mobj.c index 8673f7181..7e1e13714 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8025,7 +8025,8 @@ static boolean P_MobjRegularThink(mobj_t *mobj) } } - K_ReduceVFX(mobj, mobj->target->player); + P_SetTarget(&mobj->owner, mobj->target); + mobj->renderflags |= RF_REDUCEVFX; break; } case MT_BOOSTFLAME: @@ -8114,7 +8115,8 @@ static boolean P_MobjRegularThink(mobj_t *mobj) S_StartSound(mobj, sfx_cdfm17); K_MatchGenericExtraFlags(mobj, mobj->target); - K_ReduceVFX(mobj, mobj->target->player); + P_SetTarget(&mobj->owner, mobj->target); + mobj->renderflags |= RF_REDUCEVFX; if (leveltime & 1) mobj->renderflags |= RF_DONTDRAW; } @@ -8319,7 +8321,8 @@ static boolean P_MobjRegularThink(mobj_t *mobj) mobj->renderflags = (mobj->renderflags & ~RF_TRANSMASK)|(trans << RF_TRANSSHIFT); } - K_ReduceVFX(mobj, mobj->target->player); + P_SetTarget(&mobj->owner, mobj->target); + mobj->renderflags |= RF_REDUCEVFX; break; case MT_MAGICIANBOX: { diff --git a/src/p_user.c b/src/p_user.c index 516bc168a..7b43fca17 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1164,7 +1164,8 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->old_pitch = mobj->old_pitch2; ghost->old_roll = mobj->old_roll2; - K_ReduceVFX(ghost, mobj->player); + P_SetTarget(&ghost->owner, mobj); + ghost->renderflags |= RF_REDUCEVFX; ghost->reappear = mobj->reappear; P_SetTarget(&ghost->punt_ref, mobj->punt_ref);