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

Merge branch 'next' into compiler-garbage

Browse source
This commit is contained in:
Sally Cochenour 2019-02-26 18:09:26 -05:00
commit 10db147a0c
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_game.c
View file

@ -4896,9 +4896,9 @@ void G_WriteGhostTic(mobj_t *ghost)
void G_ConsGhostTic(void) void G_ConsGhostTic(void)
{ {
UINT8 ziptic; UINT8 ziptic;
UINT32 px,py,pz,gx,gy,gz; fixed_t px,py,pz,gx,gy,gz;
mobj_t *testmo; mobj_t *testmo;
UINT32 syncleeway; fixed_t syncleeway;
boolean nightsfail = false; boolean nightsfail = false;
if (!demo_p || !demo_start) if (!demo_p || !demo_start)

15
src/k_kart.c
View file

@ -2773,11 +2773,24 @@ void K_SpawnSparkleTrail(mobj_t *mo)
void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent) void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
{ {
mobj_t *dust; mobj_t *dust;
angle_t aoff;
I_Assert(mo != NULL); I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
dust = P_SpawnMobj(mo->x + (P_RandomRange(-25,25) * mo->scale), mo->y + (P_RandomRange(-25,25) * mo->scale), mo->z, MT_WIPEOUTTRAIL); if (mo->player)
aoff = (mo->player->frameangle + ANGLE_180);
else
aoff = (mo->angle + ANGLE_180);
if ((leveltime / 2) & 1)
aoff -= ANGLE_45;
else
aoff += ANGLE_45;
dust = P_SpawnMobj(mo->x + FixedMul(24*mo->scale, FINECOSINE(aoff>>ANGLETOFINESHIFT)) + (P_RandomRange(-8,8) << FRACBITS),
mo->y + FixedMul(24*mo->scale, FINESINE(aoff>>ANGLETOFINESHIFT)) + (P_RandomRange(-8,8) << FRACBITS),
mo->z, MT_WIPEOUTTRAIL);
P_SetTarget(&dust->target, mo); P_SetTarget(&dust->target, mo);
dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy); dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy);