refactor(input): elimina InputState vestigial

source/game/entities/player.cpp

@@ -11,7 +11,6 @@
 #include "core/audio/audio.hpp"
 #include "core/input/gamepad_bindings.hpp"
 #include "core/input/gamepad_manager.hpp"
-#include "core/input/input_state.hpp"
 #include "core/rendering/canvas.hpp"
 #include "core/rendering/effects/shadow.hpp"
 #include "core/rendering/screen.hpp"
@@ -46,12 +45,12 @@ namespace {
     void accumulateGamepadMovement(int player_id, float& vx, float& vy) {
         SDL_Gamepad* pad = GamepadManager::get().getForPlayer(player_id);
         if (pad == nullptr) { return; }
-        if (InputState::getGamepadButton(pad, SDL_GAMEPAD_BUTTON_DPAD_LEFT)) { vx -= SPEED_PX_PER_S; }
-        if (InputState::getGamepadButton(pad, SDL_GAMEPAD_BUTTON_DPAD_RIGHT)) { vx += SPEED_PX_PER_S; }
-        if (InputState::getGamepadButton(pad, SDL_GAMEPAD_BUTTON_DPAD_UP)) { vy -= SPEED_PX_PER_S; }
-        if (InputState::getGamepadButton(pad, SDL_GAMEPAD_BUTTON_DPAD_DOWN)) { vy += SPEED_PX_PER_S; }
-        const Sint16 LX = InputState::getGamepadAxis(pad, SDL_GAMEPAD_AXIS_LEFTX);
-        const Sint16 LY = InputState::getGamepadAxis(pad, SDL_GAMEPAD_AXIS_LEFTY);
+        if (SDL_GetGamepadButton(pad, SDL_GAMEPAD_BUTTON_DPAD_LEFT)) { vx -= SPEED_PX_PER_S; }
+        if (SDL_GetGamepadButton(pad, SDL_GAMEPAD_BUTTON_DPAD_RIGHT)) { vx += SPEED_PX_PER_S; }
+        if (SDL_GetGamepadButton(pad, SDL_GAMEPAD_BUTTON_DPAD_UP)) { vy -= SPEED_PX_PER_S; }
+        if (SDL_GetGamepadButton(pad, SDL_GAMEPAD_BUTTON_DPAD_DOWN)) { vy += SPEED_PX_PER_S; }
+        const Sint16 LX = SDL_GetGamepadAxis(pad, SDL_GAMEPAD_AXIS_LEFTX);
+        const Sint16 LY = SDL_GetGamepadAxis(pad, SDL_GAMEPAD_AXIS_LEFTY);
         if (LX < -STICK_DEADZONE) { vx -= SPEED_PX_PER_S; }
         if (LX > STICK_DEADZONE) { vx += SPEED_PX_PER_S; }
         if (LY < -STICK_DEADZONE) { vy -= SPEED_PX_PER_S; }
@@ -657,11 +656,7 @@ void Player::tick(float delta_time) {
     // (`KeyRemap::update` que llig `Options::keys_game` cada frame).
     refreshControlsFromOptions();
 
-    // Via `InputState` en lloc de `SDL_GetKeyboardState` directe: quan el
-    // service menu (o qualsevol UI modal) està obert, el wrapper retorna
-    // un buffer tot-a-zero perquè el jugador no es mogui mentre l'usuari
-    // navega el menú. Polling-blocked; veure `core/input/input_state.hpp`.
-    const bool* keys = InputState::getKeyboardState();
+    const bool* keys = SDL_GetKeyboardState(nullptr);
     float vx = 0.0F;
     float vy = 0.0F;
     if (keys[controls_.left]) { vx -= SPEED_PX_PER_S; }
@@ -669,9 +664,7 @@ void Player::tick(float delta_time) {
     if (keys[controls_.up]) { vy -= SPEED_PX_PER_S; }
     if (keys[controls_.down]) { vy += SPEED_PX_PER_S; }
 
-    // Cruceta i stick esquerre del mando assignat (si n'hi ha). També
-    // respecten el bloqueig d'`InputState`, així que amb el menú obert
-    // els botons tornen false/0 i no contribueixen a la velocitat.
+    // Cruceta i stick esquerre del mando assignat (si n'hi ha).
     accumulateGamepadMovement(id_, vx, vy);
 
     input_vx_ = vx;
@@ -749,7 +742,7 @@ auto Player::consumeJumpEdge() -> bool {
     // dos passa de no-premut a premut aquest frame, comptem com a salt.
     // Sense detecció de flanc, mantenir la tecla provocaria saltar
     // immediatament en aterrar.
-    const bool* keys = InputState::getKeyboardState();
+    const bool* keys = SDL_GetKeyboardState(nullptr);
     const bool KEY_NOW = keys[controls_.jump];
     bool edge = (KEY_NOW && !jump_held_keyboard_);
     jump_held_keyboard_ = KEY_NOW;
@@ -758,8 +751,7 @@ auto Player::consumeJumpEdge() -> bool {
     const auto& slot = (id_ == 0) ? Options::controls().gamepad_p1
                                   : Options::controls().gamepad_p2;
     const int JUMP_BTN = GamepadBindings::get().getButton(slot.name, slot.path, GamepadBindings::Action::JUMP);
-    const bool PAD_NOW = (pad != nullptr) && !InputState::isBlocked() &&
-        GamepadBindings::isPressed(pad, JUMP_BTN);
+    const bool PAD_NOW = (pad != nullptr) && GamepadBindings::isPressed(pad, JUMP_BTN);
     if (PAD_NOW && !jump_held_gamepad_) { edge = true; }
     jump_held_gamepad_ = PAD_NOW;
 
@@ -770,7 +762,7 @@ auto Player::consumeAttackEdge() -> bool {
     // Mateix patró que `consumeJumpEdge` però per al botó d'atac. El botó
     // físic ve d'`GamepadBindings`, persistit per dispositiu — l'usuari
     // l'ha pogut remapejar des del menú de servei.
-    const bool* keys = InputState::getKeyboardState();
+    const bool* keys = SDL_GetKeyboardState(nullptr);
     const bool KEY_NOW = keys[controls_.attack];
     bool edge = (KEY_NOW && !attack_held_keyboard_);
     attack_held_keyboard_ = KEY_NOW;
@@ -779,8 +771,7 @@ auto Player::consumeAttackEdge() -> bool {
     const auto& slot = (id_ == 0) ? Options::controls().gamepad_p1
                                   : Options::controls().gamepad_p2;
     const int ATK_BTN = GamepadBindings::get().getButton(slot.name, slot.path, GamepadBindings::Action::ATTACK);
-    const bool PAD_NOW = (pad != nullptr) && !InputState::isBlocked() &&
-        GamepadBindings::isPressed(pad, ATK_BTN);
+    const bool PAD_NOW = (pad != nullptr) && GamepadBindings::isPressed(pad, ATK_BTN);
     if (PAD_NOW && !attack_held_gamepad_) { edge = true; }
     attack_held_gamepad_ = PAD_NOW;
 

source/game/ui/service_menu.cpp

@@ -9,7 +9,6 @@
 #include "core/audio/audio.hpp"
 #include "core/input/gamepad_bindings.hpp"
 #include "core/input/gamepad_manager.hpp"
-#include "core/input/input_state.hpp"
 #include "core/input/key_config.hpp"
 #include "core/locale/locale.hpp"
 #include "core/rendering/canvas.hpp"
@@ -246,11 +245,6 @@ void ServiceMenu::toggle() {
         open_ = true;
         closing_ = false;
         animated_h_ = 0.0F;  // Comença des de 0 perquè la caixa crega.
-        // Bloqueja l'input de polling: els consumidors com `Player` veuran
-        // l'estat del teclat tot-a-zero mentre el menú sigui obert. Els
-        // events (KEY_DOWN, etc.) ja els consumeix `processMenuInput`,
-        // així que la navegació del menú no es veu afectada.
-        InputState::setBlocked(true);
     }
 }
 
@@ -259,9 +253,6 @@ void ServiceMenu::close() {
     open_ = false;
     closing_ = true;  // `open_anim_` decaurà a update; la caixa es veu mentre dura.
     capturing_ = false;
-    // Allibera el polling de seguida — la closing animation és purament
-    // visual i no ha d'impedir que el jugador es mogui un cop ha tancat.
-    InputState::setBlocked(false);
 }
 
 // `isVisible` inclou l'animació de tancament: retorna true mentre open_anim_>0