From d50410f06b000e49d0e0e2d67ec4e4a8e8b36f48 Mon Sep 17 00:00:00 2001 From: NY00123 Date: Sat, 11 Apr 2020 11:19:06 +0300 Subject: [PATCH] SW: With the input tied to frame rate, disable aiming while the player is dead, and also disable horizontal aiming while on a ladder. --- source/sw/src/game.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index d67abf1af..ec1fe022f 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -3280,11 +3280,12 @@ getinput(SW_PACKET *loc, SWBOOL tied) q16avel = fix16_floor(q16avel); q16horz = fix16_floor(q16horz); } - else + else if (!TEST(pp->Flags, PF_DEAD)) { void DoPlayerTurn(PLAYERp pp, fix16_t *pq16ang, fix16_t q16avel); void DoPlayerHorizon(PLAYERp pp, fix16_t *pq16horiz, fix16_t q16horz); - DoPlayerTurn(pp, &pp->camq16ang, q16avel); + if (!TEST(pp->Flags, PF_CLIMBING)) + DoPlayerTurn(pp, &pp->camq16ang, q16avel); DoPlayerHorizon(pp, &pp->camq16horiz, q16horz); }