lara: fix drop-grab

Resolves #911.
LostArtefacts · Aug 15, 2023 · 66498b6 · 66498b6
1 parent f6c8af4
commit 66498b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## [Unreleased](https://github.com/rr-/Tomb1Main/compare/stable...develop) - ××××-××-××
 - fixed Lara stuttering when performing certain animations (#901, regression from 2.14)
+- fixed Lara not grabbing certain edges when the swing-cancel option is enabled (#911)
 
 ## [2.15.2](https://github.com/rr-/Tomb1Main/compare/2.15.1...2.15.2) - 2023-07-17
 - fixed Natla not leaving her semi-death state after Lara takes her down for the first time (#892, regression from 2.15.1)

diff --git a/src/game/lara/lara_state.c b/src/game/lara/lara_state.c
@@ -522,7 +522,9 @@ void Lara_State_LeftJump(ITEM_INFO *item, COLL_INFO *coll)
 
 void Lara_State_UpJump(ITEM_INFO *item, COLL_INFO *coll)
 {
-    if (item->fall_speed > LARA_FASTFALL_SPEED) {
+    if (item->fall_speed
+        > (g_Config.enable_swing_cancel ? LARA_SWING_FASTFALL_SPEED
+                                        : LARA_FASTFALL_SPEED)) {
         item->goal_anim_state = LS_FAST_FALL;
     }
 }

diff --git a/src/global/const.h b/src/global/const.h
@@ -56,6 +56,7 @@
 #define LARA_LEAN_MAX ((10 * PHD_DEGREE) + LARA_LEAN_UNDO) // = 2002
 #define LARA_LEAN_MAX_UW (LARA_LEAN_MAX * 2)
 #define LARA_FASTFALL_SPEED (FASTFALL_SPEED + 3) // = 131
+#define LARA_SWING_FASTFALL_SPEED (LARA_FASTFALL_SPEED + 2) // = 133
 #define LARA_RAD 100 // global radius of g_Lara
 #define LARA_HEIGHT 762 // global height of g_Lara - less than 3/4 block
 #define UW_MAXSPEED 200