From 106afa9ace3f5a7b6dd21bcc8b587a812212c797 Mon Sep 17 00:00:00 2001 From: SteelT Date: Mon, 29 Mar 2021 00:15:52 -0400 Subject: [PATCH] Make spawning look less squished --- src/k_kart.c | 33 +++++++++++++++------------------ src/p_inter.c | 2 +- src/p_user.c | 2 +- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 623955413..f272f98d9 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3815,26 +3815,23 @@ void K_SpawnSparkleTrail(mobj_t *mo) void K_SpawnInvincibilitySpeedLines(mobj_t *mo) { - INT32 i = 0; - INT32 nl = 2; - for (i = 0; i < nl ; i++) - { - mobj_t *fast = P_SpawnMobj(mo->x + (P_RandomRange(-24,64) * mo->scale), - mo->y + (P_RandomRange(-16,16) * mo->scale), - mo->z + (mo->height/2) + (P_RandomRange(-16,16) * mo->scale), - MT_FASTLINE); - fast->momx = 3*mo->momx/4; - fast->momy = 3*mo->momy/4; - fast->momz = 3*mo->momz/4; + mobj_t *fast = P_SpawnMobjFromMobj(mo, + P_RandomRange(-48, 48) * FRACUNIT, + P_RandomRange(-48, 48) * FRACUNIT, + P_RandomRange(0, 64) * FRACUNIT, + MT_FASTLINE); - P_SetTarget(&fast->target, mo); - fast->angle = K_MomentumAngle(mo); - fast->color = mo->color; - fast->colorized = true; - K_MatchGenericExtraFlags(fast, mo); - P_SetMobjState(fast, S_KARTINVLINES1); - } + fast->momx = 3*mo->momx/4; + fast->momy = 3*mo->momy/4; + fast->momz = 3*mo->momz/4; + + P_SetTarget(&fast->target, mo); + fast->angle = K_MomentumAngle(mo); + fast->color = mo->color; + fast->colorized = true; + K_MatchGenericExtraFlags(fast, mo); + P_SetMobjState(fast, S_KARTINVLINES1); } void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent) diff --git a/src/p_inter.c b/src/p_inter.c index 1c07a5a90..6e367a9fe 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1984,7 +1984,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da { if (source->player->kartstuff[k_invincibilitytimer]) { - kinvextend = (source->player->kartstuff[k_invincibilitytimer])+2*TICRATE; + kinvextend = (source->player->kartstuff[k_invincibilitytimer])+5*TICRATE; CONS_Printf("extend k_invincibilitytimer for %s - old value %d new value %d\n", player_names[source->player - players], source->player->kartstuff[k_invincibilitytimer]/TICRATE, kinvextend/TICRATE); source->player->kartstuff[k_invincibilitytimer] = kinvextend; } diff --git a/src/p_user.c b/src/p_user.c index 0f060295b..a89bec290 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2377,7 +2377,7 @@ void P_MovePlayer(player_t *player) if (player->kartstuff[k_invincibilitytimer] > 0) { K_SpawnSparkleTrail(player->mo); - if (player->kartstuff[k_invincibilitytimer] > 5*TICRATE && player->speed > 10*player->mo->scale && (leveltime & 8)) + if (player->kartstuff[k_invincibilitytimer] > 5*TICRATE && player->speed > 10*player->mo->scale && (leveltime % 8) == 0) K_SpawnInvincibilitySpeedLines(player->mo); }