From 2be2277f4b2583fa1d5c9df56f0dadf5d01f5b8e Mon Sep 17 00:00:00 2001 From: Sryder Date: Sun, 22 Mar 2020 00:44:28 +0000 Subject: [PATCH] Fix the merge confluct I SOMEHOW missed --- src/k_kart.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 3fe2b9b3c..29579ad50 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2157,8 +2157,8 @@ void K_RespawnChecker(player_t *player) fixed_t newx, newy, newz; newangle = FixedAngle(((360/8)*i)*FRACUNIT); - 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); + 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); if (player->mo->eflags & MFE_VERTICALFLIP) newz = player->mo->z + player->mo->height; else @@ -2172,8 +2172,8 @@ void K_RespawnChecker(player_t *player) laser->eflags |= MFE_VERTICALFLIP; P_SetTarget(&laser->target, player->mo); laser->angle = newangle+ANGLE_90; - mo->momz = (8 * player->mo->scale) * P_MobjFlip(player->mo); - P_SetScale(mo, (mo->destscale = player->mo->scale)); + laser->momz = (8 * player->mo->scale) * P_MobjFlip(player->mo); + P_SetScale(laser, (laser->destscale = player->mo->scale)); } } }