thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace K_ReduceVFX with K_ReduceVFXForEveryone, replace owner cases with RF_REDUCEVFX

Browse source
This commit is contained in:
James R 2023-11-13 19:52:58 -08:00
parent 5547ad5966
commit ee7f3d7108
10 changed files with 52 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_hitlag.c
View file

@ -126,7 +126,7 @@ static void K_SpawnSingleHitLagSpark(
spark->colorized = true; spark->colorized = true;
} }
K_ReduceVFX(spark, NULL); K_ReduceVFXForEveryone(spark);
} }
} }

57
src/k_kart.c
View file

@ -316,7 +316,7 @@ UINT32 K_GetPlayerDontDrawFlag(player_t *player)
return flag; return flag;
} }
void K_ReduceVFX(mobj_t *mo, player_t *owner) void K_ReduceVFXForEveryone(mobj_t *mo)
{ {
if (cv_reducevfx.value == 0) if (cv_reducevfx.value == 0)
{ {
@ -325,11 +325,6 @@ void K_ReduceVFX(mobj_t *mo, player_t *owner)
} }
mo->renderflags |= RF_DONTDRAW; mo->renderflags |= RF_DONTDRAW;
if (owner != NULL)
{
mo->renderflags &= ~K_GetPlayerDontDrawFlag(owner);
}
} }
// Angle reflection used by springs & speed pads // Angle reflection used by springs & speed pads
@ -1713,7 +1708,8 @@ spawn_brake_dust
P_SetScale(spark, (spark->destscale = P_SetScale(spark, (spark->destscale =
FixedMul(scale, spark->scale))); 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) 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)), P_RandomFlip(P_RandomRange(PR_DECORATION, FRACUNIT/2, FRACUNIT)),
FixedMul(scale, player->speed)); FixedMul(scale, player->speed));
K_ReduceVFX(clip, player); P_SetTarget(&clip->owner, player->mo);
clip->renderflags |= RF_REDUCEVFX;
} }
void K_SpawnDriftBoostClipSpark(mobj_t *clip) 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_MatchGenericExtraFlags(fast, player->mo);
K_ReduceVFX(fast, player); P_SetTarget(&fast->owner, player->mo);
fast->renderflags |= RF_REDUCEVFX;
if (top) if (top)
{ {
@ -1926,7 +1924,8 @@ void K_SpawnInvincibilitySpeedLines(mobj_t *mo)
fast->momz = 3*P_GetMobjZMovement(mo)/4; fast->momz = 3*P_GetMobjZMovement(mo)/4;
K_MatchGenericExtraFlags(fast, mo); K_MatchGenericExtraFlags(fast, mo);
K_ReduceVFX(fast, mo->player); P_SetTarget(&fast->owner, mo);
fast->renderflags |= RF_REDUCEVFX;
fast->color = mo->color; fast->color = mo->color;
fast->colorized = true; fast->colorized = true;
@ -3040,7 +3039,8 @@ void K_SpawnWaterRunParticles(mobj_t *mobj)
water->momz = mobj->momz; water->momz = mobj->momz;
P_SetScale(water, trailScale); P_SetScale(water, trailScale);
P_SetMobjState(water, curUnderlayFrame); P_SetMobjState(water, curUnderlayFrame);
K_ReduceVFX(water, mobj->player); P_SetTarget(&water->owner, mobj);
water->renderflags |= RF_REDUCEVFX;
// overlay // overlay
water = P_SpawnMobj(x1, y1, water = P_SpawnMobj(x1, y1,
@ -3052,7 +3052,8 @@ void K_SpawnWaterRunParticles(mobj_t *mobj)
water->momz = mobj->momz; water->momz = mobj->momz;
P_SetScale(water, trailScale); P_SetScale(water, trailScale);
P_SetMobjState(water, curOverlayFrame); P_SetMobjState(water, curOverlayFrame);
K_ReduceVFX(water, mobj->player); P_SetTarget(&water->owner, mobj);
water->renderflags |= RF_REDUCEVFX;
// Right // Right
// Underlay // Underlay
@ -3065,7 +3066,8 @@ void K_SpawnWaterRunParticles(mobj_t *mobj)
water->momz = mobj->momz; water->momz = mobj->momz;
P_SetScale(water, trailScale); P_SetScale(water, trailScale);
P_SetMobjState(water, curUnderlayFrame); P_SetMobjState(water, curUnderlayFrame);
K_ReduceVFX(water, mobj->player); P_SetTarget(&water->owner, mobj);
water->renderflags |= RF_REDUCEVFX;
// Overlay // Overlay
water = P_SpawnMobj(x2, y2, water = P_SpawnMobj(x2, y2,
@ -3077,7 +3079,8 @@ void K_SpawnWaterRunParticles(mobj_t *mobj)
water->momz = mobj->momz; water->momz = mobj->momz;
P_SetScale(water, trailScale); P_SetScale(water, trailScale);
P_SetMobjState(water, curOverlayFrame); P_SetMobjState(water, curOverlayFrame);
K_ReduceVFX(water, mobj->player); P_SetTarget(&water->owner, mobj);
water->renderflags |= RF_REDUCEVFX;
if (!S_SoundPlaying(mobj, sfx_s3kdbs)) if (!S_SoundPlaying(mobj, sfx_s3kdbs))
{ {
@ -5078,7 +5081,8 @@ static void K_SpawnDriftElectricity(player_t *player)
spark->momz = mo->momz; spark->momz = mo->momz;
spark->color = color; spark->color = color;
K_GenericExtraFlagsNoZAdjust(spark, mo); K_GenericExtraFlagsNoZAdjust(spark, mo);
K_ReduceVFX(spark, player); P_SetTarget(&spark->owner, mo);
spark->renderflags |= RF_REDUCEVFX;
spark->spritexscale += scalefactor/3; spark->spritexscale += scalefactor/3;
spark->spriteyscale += scalefactor/8; spark->spriteyscale += scalefactor/8;
@ -5128,7 +5132,8 @@ void K_SpawnDriftElectricSparks(player_t *player, int color, boolean shockwave)
spark->frame |= FF_ADD; spark->frame |= FF_ADD;
sparkangle += ANGLE_90; 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; spark->tics += trail;
K_MatchGenericExtraFlags(spark, player->mo); K_MatchGenericExtraFlags(spark, player->mo);
K_ReduceVFX(spark, player); P_SetTarget(&spark->owner, player->mo);
spark->renderflags |= RF_REDUCEVFX;
} }
if (player->driftcharge >= dsthree) 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); wave = P_SpawnMobj(p->mo->x, p->mo->y, p->mo->floorz, MT_SOFTLANDING);
P_InstaScale(wave, p->mo->scale); P_InstaScale(wave, p->mo->scale);
P_SetTarget(&wave->target, p->mo); P_SetTarget(&wave->target, p->mo);
K_ReduceVFX(wave, p); P_SetTarget(&wave->owner, p->mo);
wave->renderflags |= RF_REDUCEVFX;
} }
// sound // sound
@ -10388,7 +10395,8 @@ void K_KartEbrakeVisuals(player_t *p)
p->mo->hprev->angle = p->mo->angle; 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. 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_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->sprzoff = p->mo->sprzoff;
p->mo->hprev->colorized = false; p->mo->hprev->colorized = false;
@ -10406,7 +10414,8 @@ void K_KartEbrakeVisuals(player_t *p)
spdl->colorized = true; spdl->colorized = true;
spdl->color = SKINCOLOR_WHITE; spdl->color = SKINCOLOR_WHITE;
K_MatchGenericExtraFlags(spdl, p->mo); 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); P_SetScale(spdl, p->mo->scale);
// squish the player a little bit. // 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->momx = FixedMul(hmomentum, FINECOSINE(ang >> ANGLETOFINESHIFT));
dust->momy = FixedMul(hmomentum, FINESINE(ang >> ANGLETOFINESHIFT)); dust->momy = FixedMul(hmomentum, FINESINE(ang >> ANGLETOFINESHIFT));
dust->momz = vmomentum * flip; 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; wind->momz = 3 * P_GetMobjZMovement(parent) / 4;
K_MatchGenericExtraFlags(wind, parent); 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 // 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); P_SetTarget(&grease->target, player->mo);
grease->angle = K_MomentumAngle(player->mo); grease->angle = K_MomentumAngle(player->mo);
grease->extravalue1 = i; grease->extravalue1 = i;
K_ReduceVFX(grease, player); P_SetTarget(&grease->owner, player->mo);
grease->renderflags |= RF_REDUCEVFX;
} }
} }

2
src/k_kart.h
View file

@ -67,7 +67,7 @@ void K_TimerReset(void);
void K_TimerInit(void); void K_TimerInit(void);
UINT32 K_GetPlayerDontDrawFlag(player_t *player); 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); boolean K_IsPlayerLosing(player_t *player);
fixed_t K_GetKartGameSpeedScalar(SINT8 value); fixed_t K_GetKartGameSpeedScalar(SINT8 value);

3
src/k_terrain.c
View file

@ -630,7 +630,8 @@ void K_ProcessTerrainEffect(mobj_t *mo)
spark->fuse = 9; spark->fuse = 9;
spark->cusval = K_StairJankFlip(ANGLE_90); spark->cusval = K_StairJankFlip(ANGLE_90);
P_SetTarget(&spark->target, mo); P_SetTarget(&spark->target, mo);
K_ReduceVFX(spark, player); P_SetTarget(&spark->owner, mo);
spark->renderflags |= RF_REDUCEVFX;
} }
player->stairjank = 17; player->stairjank = 17;

2
src/objects/broly.c
View file

@ -51,7 +51,7 @@ Obj_SpawnBrolyKi
x->tics = (duration + BUFFER_TICS); x->tics = (duration + BUFFER_TICS);
K_ReduceVFX(x, NULL); K_ReduceVFXForEveryone(x);
S_StartSound(x, sfx_cdfm74); S_StartSound(x, sfx_cdfm74);

3
src/objects/ufo.c
View file

@ -112,7 +112,8 @@ static void SpawnEmeraldSpeedLines(mobj_t *mo)
fast->momz = 3*P_GetMobjZMovement(mo)/4; fast->momz = 3*P_GetMobjZMovement(mo)/4;
K_MatchGenericExtraFlags(fast, mo); K_MatchGenericExtraFlags(fast, mo);
K_ReduceVFX(fast, mo->player); P_SetTarget(&fast->owner, mo);
fast->renderflags |= RF_REDUCEVFX;
fast->color = mo->color; fast->color = mo->color;
fast->colorized = true; fast->colorized = true;

3
src/p_enemy.c
View file

@ -3828,7 +3828,8 @@ void A_AttractChase(mobj_t *actor)
P_SetTarget(&sparkle->target, actor->target); P_SetTarget(&sparkle->target, actor->target);
sparkle->angle = (actor->target->angle + (offset>>1)) + (offset * actor->target->player->sparkleanim); sparkle->angle = (actor->target->angle + (offset>>1)) + (offset * actor->target->player->sparkleanim);
actor->target->player->sparkleanim = (actor->target->player->sparkleanim+1) % 20; 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); P_KillMobj(actor, actor->target, actor->target, DMG_NORMAL);
return; return;

3
src/p_map.c
View file

@ -3177,7 +3177,8 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff, Try
spark->fuse = 9; spark->fuse = 9;
spark->cusval = K_StairJankFlip(ANGLE_90); spark->cusval = K_StairJankFlip(ANGLE_90);
P_SetTarget(&spark->target, thing); P_SetTarget(&spark->target, thing);
K_ReduceVFX(spark, thing->player); P_SetTarget(&spark->owner, thing);
spark->renderflags |= RF_REDUCEVFX;
} }
thing->player->stairjank = 17; thing->player->stairjank = 17;

9
src/p_mobj.c
View file

@ -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; break;
} }
case MT_BOOSTFLAME: case MT_BOOSTFLAME:
@ -8114,7 +8115,8 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
S_StartSound(mobj, sfx_cdfm17); S_StartSound(mobj, sfx_cdfm17);
K_MatchGenericExtraFlags(mobj, mobj->target); K_MatchGenericExtraFlags(mobj, mobj->target);
K_ReduceVFX(mobj, mobj->target->player); P_SetTarget(&mobj->owner, mobj->target);
mobj->renderflags |= RF_REDUCEVFX;
if (leveltime & 1) if (leveltime & 1)
mobj->renderflags |= RF_DONTDRAW; mobj->renderflags |= RF_DONTDRAW;
} }
@ -8319,7 +8321,8 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
mobj->renderflags = (mobj->renderflags & ~RF_TRANSMASK)|(trans << RF_TRANSSHIFT); 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; break;
case MT_MAGICIANBOX: case MT_MAGICIANBOX:
{ {

3
src/p_user.c
View file

@ -1164,7 +1164,8 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
ghost->old_pitch = mobj->old_pitch2; ghost->old_pitch = mobj->old_pitch2;
ghost->old_roll = mobj->old_roll2; ghost->old_roll = mobj->old_roll2;
K_ReduceVFX(ghost, mobj->player); P_SetTarget(&ghost->owner, mobj);
ghost->renderflags |= RF_REDUCEVFX;
ghost->reappear = mobj->reappear; ghost->reappear = mobj->reappear;
P_SetTarget(&ghost->punt_ref, mobj->punt_ref); P_SetTarget(&ghost->punt_ref, mobj->punt_ref);