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 the merge confluct I SOMEHOW missed

Browse source
This commit is contained in:
Sryder 2020-03-22 00:44:28 +00:00
parent 203aa0602e
commit 2be2277f4b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_kart.c
View file

@ -2157,8 +2157,8 @@ void K_RespawnChecker(player_t *player)
fixed_t newx, newy, newz; fixed_t newx, newy, newz;
newangle = FixedAngle(((360/8)*i)*FRACUNIT); newangle = FixedAngle(((360/8)*i)*FRACUNIT);
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31 * player->mo->scale); newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31 * player->mo->scale);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * player->mo->scale); newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * player->mo->scale);
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
newz = player->mo->z + player->mo->height; newz = player->mo->z + player->mo->height;
else else
@ -2172,8 +2172,8 @@ void K_RespawnChecker(player_t *player)
laser->eflags |= MFE_VERTICALFLIP; laser->eflags |= MFE_VERTICALFLIP;
P_SetTarget(&laser->target, player->mo); P_SetTarget(&laser->target, player->mo);
laser->angle = newangle+ANGLE_90; laser->angle = newangle+ANGLE_90;
mo->momz = (8 * player->mo->scale) * P_MobjFlip(player->mo); laser->momz = (8 * player->mo->scale) * P_MobjFlip(player->mo);
P_SetScale(mo, (mo->destscale = player->mo->scale)); P_SetScale(laser, (laser->destscale = player->mo->scale));
} }
} }
} }