From 926d77072e3c8b0e96c7a048da4e25bd718f7190 Mon Sep 17 00:00:00 2001
From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com>
Date: Wed, 5 Feb 2025 17:59:39 +0100
Subject: [PATCH] Fix merge

---
 src/input/input_handler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input_handler.cpp b/src/input/input_handler.cpp
index ec0161d4e..e2e2e67ab 100644
--- a/src/input/input_handler.cpp
+++ b/src/input/input_handler.cpp
@@ -464,7 +464,7 @@ void ControllerOutput::AddUpdate(InputEvent event) {
         }
 
     } else if (axis != SDL_GAMEPAD_AXIS_INVALID) {
-        auto ApplyDeadzone = [](s16* value, std::pair<int, int> deadzone) {
+        auto ApplyDeadzone = [](s8* value, std::pair<int, int> deadzone) {
             if (std::abs(*value) <= deadzone.first || deadzone.first == deadzone.second) {
                 *value = 0;
             } else {