From 817af99b29b64244b6fb00f0edfda271fcf48d9c Mon Sep 17 00:00:00 2001 From: Sezz Date: Sun, 26 Sep 2021 14:33:38 +1000 Subject: [PATCH] Fixed issues with new leaning. --- TR5Main/Game/Lara/lara.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/TR5Main/Game/Lara/lara.cpp b/TR5Main/Game/Lara/lara.cpp index 697447e70..4a247831f 100644 --- a/TR5Main/Game/Lara/lara.cpp +++ b/TR5Main/Game/Lara/lara.cpp @@ -913,15 +913,12 @@ void LaraAboveWater(ITEM_INFO* item, COLL_INFO* coll) //hmmmm // Handle current Lara status lara_control_routines[item->currentAnimState](item, coll); - // ISSUES: - // Continued lean when vaulting. - // Continued lean in sprint > run transition. - // TODO: These commented conditions result in more accurate behaviour, but I suppose this is what we would call "hardcoding". @Sezz 2021.09.26 + // TODO: These commented conditions result in more accurate behaviour, but I suppose this is what we would call "hardcoding". + // Leaving this for now in case something catastrophic is discovered with the simpler check. @Sezz 2021.09.26 /*if ((item->currentAnimState != LS_RUN_FORWARD && item->currentAnimState != LS_SPRINT) || ((item->currentAnimState == LS_RUN_FORWARD || item->currentAnimState == LS_SPRINT) && !((TrInput & IN_LEFT) || (TrInput & IN_RIGHT))))*/ - if (!Lara.isMoving - && !(TrInput & (IN_LEFT | IN_RIGHT))) + if (!Lara.isMoving || (Lara.isMoving && !(TrInput & (IN_LEFT | IN_RIGHT)))) { if (item->pos.zRot >= ANGLE(0.0f)) item->pos.zRot -= item->pos.zRot / 7;