From bfdfeb3dc00755e2148d808955a4458f8a193cf8 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Fri, 17 Apr 2026 22:28:50 +0500
Subject: [PATCH] engine: client: fix Joy_GetHatValueForAxis threshold for
 forward axis, fix bindings limit

---
 engine/client/in_joy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engine/client/in_joy.c b/engine/client/in_joy.c
index abe08880..c31ee907 100644
--- a/engine/client/in_joy.c
+++ b/engine/client/in_joy.c
@@ -197,7 +197,7 @@ static int Joy_GetHatValueForAxis( const engineAxis_t engineAxis )
 		positive = JOY_HAT_RIGHT;
 		break;
 	case JOY_AXIS_FWD:
-		threshold = joy_side_key_threshold.value;
+		threshold = joy_forward_key_threshold.value;
 		negative = JOY_HAT_UP;
 		positive = JOY_HAT_DOWN;
 		break;
@@ -318,7 +318,7 @@ void Joy_FinalizeMove( float *fw, float *side, float *dpitch, float *dyaw )
 		const char *bind = joy_axis_binding.string;
 		size_t i;
 
-		for( i = 0; bind[i]; i++ )
+		for( i = 0; bind[i] && i < MAX_AXES; i++ )
 		{
 			switch( bind[i] )
 			{