From 0c8b76985d647067e529d8c2a3c21c333c0e3582 Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Fri, 6 Sep 2024 01:22:33 +0200 Subject: [PATCH] lara-cheat: fix fly cheat and harpoon Resolves #199. --- src/game/gun/gun.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/game/gun/gun.c b/src/game/gun/gun.c index 8b55e7c9..17527cd5 100644 --- a/src/game/gun/gun.c +++ b/src/game/gun/gun.c @@ -50,7 +50,7 @@ void __cdecl Gun_Control(void) if (g_Lara.request_gun_type != g_Lara.gun_type || (g_Input & IN_DRAW)) { if (g_Lara.request_gun_type == LGT_FLARE - || (g_Lara.skidoo == NO_ITEM + || (g_Lara.skidoo == NO_ITEM && g_Lara.water_status != LWS_CHEAT && (g_Lara.request_gun_type == LGT_HARPOON || g_Lara.water_status == LWS_ABOVE_WATER || (g_Lara.water_status == LWS_WADE @@ -82,6 +82,10 @@ void __cdecl Gun_Control(void) if ((g_Input & IN_DRAW) || g_Lara.request_gun_type != g_Lara.gun_type) { g_Lara.gun_status = LGS_UNDRAW; + } else if ( + g_Lara.gun_type == LGT_HARPOON + && g_Lara.water_status == LWS_CHEAT) { + g_Lara.gun_status = LGS_UNDRAW; } else if ( g_Lara.gun_type != LGT_HARPOON && g_Lara.water_status != LWS_ABOVE_WATER