thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix sparkle animation not being capped properly.

Browse source
This commit is contained in:
SteelT 2021-03-29 20:59:28 -04:00
parent 106afa9ace
commit 3c817774b8
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_kart.c
View file

@ -3778,14 +3778,12 @@ void K_SpawnSparkleTrail(mobj_t *mo)
if (leveltime & 2) if (leveltime & 2)
index = 2; index = 2;
//CONS_Printf("%d\n", index);
//CONS_Printf("%d\n", invanimnum);
invtime = mo->player->kartstuff[k_invincibilitytimer]/TICRATE+1; invtime = mo->player->kartstuff[k_invincibilitytimer]/TICRATE+1;
//CONS_Printf("%d\n", index);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
//newangle = (mo->angle + ANGLE_157h) + FixedAngle(((360 / 8) * i) << FRACBITS) + ANGLE_90;
newx = mo->x + (P_RandomRange(-rad, rad)*FRACUNIT); newx = mo->x + (P_RandomRange(-rad, rad)*FRACUNIT);
newy = mo->y + (P_RandomRange(-rad, rad)*FRACUNIT); newy = mo->y + (P_RandomRange(-rad, rad)*FRACUNIT);
newz = mo->z + (P_RandomRange(0, mo->height>>FRACBITS)*FRACUNIT); newz = mo->z + (P_RandomRange(0, mo->height>>FRACBITS)*FRACUNIT);
@ -3807,7 +3805,8 @@ void K_SpawnSparkleTrail(mobj_t *mo)
P_SetScale(sparkle, mo->scale); P_SetScale(sparkle, mo->scale);
} }
invanimnum = (invtime > 11) ? 11 : invtime; invanimnum = (invtime >= 11) ? 11 : invtime;
//CONS_Printf("%d\n", invanimnum);
P_SetMobjState(sparkle, K_SparkleTrailStartStates[invanimnum][index]); P_SetMobjState(sparkle, K_SparkleTrailStartStates[invanimnum][index]);
sparkle->colorized = true; sparkle->colorized = true;
sparkle->color = mo->color; sparkle->color = mo->color;
@ -3815,7 +3814,6 @@ void K_SpawnSparkleTrail(mobj_t *mo)
void K_SpawnInvincibilitySpeedLines(mobj_t *mo) void K_SpawnInvincibilitySpeedLines(mobj_t *mo)
{ {
mobj_t *fast = P_SpawnMobjFromMobj(mo, mobj_t *fast = P_SpawnMobjFromMobj(mo,
P_RandomRange(-48, 48) * FRACUNIT, P_RandomRange(-48, 48) * FRACUNIT,
P_RandomRange(-48, 48) * FRACUNIT, P_RandomRange(-48, 48) * FRACUNIT,