mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 20:41:46 +00:00
Fix the merge confluct I SOMEHOW missed
This commit is contained in:
parent
203aa0602e
commit
2be2277f4b
1 changed files with 4 additions and 4 deletions
|
|
@ -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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue