From 6a9b68cc88f0fedc9652b0d4c9ec827937bb5a68 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 10 Aug 2020 14:39:11 -0400 Subject: [PATCH] Merge p_polyobj.c --- src/p_polyobj.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/p_polyobj.c b/src/p_polyobj.c index 31decd326..8efde1fac 100644 --- a/src/p_polyobj.c +++ b/src/p_polyobj.c @@ -1152,19 +1152,8 @@ static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta, if (turnthings == 2 || (turnthings == 1 && !mo->player)) { mo->angle += delta; -<<<<<<< HEAD - if (mo->player == &players[consoleplayer]) - localangle[0] += delta; - else if (mo->player == &players[displayplayers[1]]) - localangle[1] += delta; - else if (mo->player == &players[displayplayers[2]]) - localangle[2] += delta; - else if (mo->player == &players[displayplayers[3]]) - localangle[3] += delta; -======= if (mo->player) P_SetPlayerAngle(mo->player, (angle_t)(mo->player->angleturn << 16) + delta); ->>>>>>> srb2/next } } }