From 675a072b34e262ba13f069f04814dbee2cfdb197 Mon Sep 17 00:00:00 2001 From: Maximilian Mayer Date: Sun, 28 Jul 2024 20:58:41 +0100 Subject: [PATCH] [rcore] inline body of 'GetGamepadAxisMovementDefault' and remove it --- src/rcore.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/rcore.c b/src/rcore.c index ebf04bae3..b4bc19f34 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -2949,15 +2949,10 @@ int GetGamepadAxisCount(int gamepad) return CORE.Input.Gamepad.axisCount[gamepad]; } -static float GetGamepadAxisMovementDefault(int axis) -{ - return (axis == GAMEPAD_AXIS_LEFT_TRIGGER || axis == GAMEPAD_AXIS_RIGHT_TRIGGER) ? -1.0f : 0.0f; -} - // Get axis movement vector for a gamepad float GetGamepadAxisMovement(int gamepad, int axis) { - float value = GetGamepadAxisMovementDefault(axis); + float value = (axis == GAMEPAD_AXIS_LEFT_TRIGGER || axis == GAMEPAD_AXIS_RIGHT_TRIGGER)? -1.0f : 0.0f; if ((gamepad < MAX_GAMEPADS) && CORE.Input.Gamepad.ready[gamepad] && (axis < MAX_GAMEPAD_AXIS)) { float movement = value < 0.0f ? CORE.Input.Gamepad.axisState[gamepad][axis] : fabs(CORE.Input.Gamepad.axisState[gamepad][axis]); @@ -3608,7 +3603,8 @@ static void RecordAutomationEvent(void) for (int axis = 0; axis < MAX_GAMEPAD_AXIS; axis++) { // Event type: INPUT_GAMEPAD_AXIS_MOTION - if (GetGamepadAxisMovement(gamepad, axis) != GetGamepadAxisMovementDefault(axis)) + float defaultMovement = (axis == GAMEPAD_AXIS_LEFT_TRIGGER || axis == GAMEPAD_AXIS_RIGHT_TRIGGER)? -1.0f : 0.0f; + if (GetGamepadAxisMovement(gamepad, axis) != defaultMovement) { currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter; currentEventList->events[currentEventList->count].type = INPUT_GAMEPAD_AXIS_MOTION;