mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge remote-tracking branch 'origin/master' into structgunch
This commit is contained in:
commit
d0a3447ad4
1 changed files with 2 additions and 2 deletions
|
|
@ -3827,7 +3827,7 @@ void K_SpawnSparkleTrail(mobj_t *mo)
|
||||||
INT32 i;
|
INT32 i;
|
||||||
UINT8 invanimnum; // Current sparkle animation number
|
UINT8 invanimnum; // Current sparkle animation number
|
||||||
INT32 invtime;// Invincibility time left, in seconds
|
INT32 invtime;// Invincibility time left, in seconds
|
||||||
UINT8 index = 1;
|
UINT8 index = 0;
|
||||||
fixed_t newx, newy, newz;
|
fixed_t newx, newy, newz;
|
||||||
|
|
||||||
I_Assert(mo != NULL);
|
I_Assert(mo != NULL);
|
||||||
|
|
@ -3841,7 +3841,7 @@ void K_SpawnSparkleTrail(mobj_t *mo)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (leveltime & 2)
|
if (leveltime & 2)
|
||||||
index = 2;
|
index = 1;
|
||||||
|
|
||||||
invtime = mo->player->invincibilitytimer/TICRATE+1;
|
invtime = mo->player->invincibilitytimer/TICRATE+1;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue