From aee550fb28261085f0a4132df02d4a05558809b6 Mon Sep 17 00:00:00 2001 From: david-tetlow Date: Thu, 18 Sep 2025 15:29:35 +0100 Subject: [PATCH] Added missing define for Switch 2 --- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + Packages/com.unity.inputsystem/InputSystem/Devices/Gamepad.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 9b80e149bc..990f432be9 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -10,6 +10,7 @@ however, it has to be formatted properly to pass verification tests. ## [Unreleased] - yyyy-mm-dd - Fixed InputControl picker not updating correctly when the Input Actions Window was dirty. [ISXB-1221](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1221) +- Added missing UNITY_SWITCH2 define in Gamepad.cs to fix button display names ### Changed - Expanded `RebindingUISample` to include a "game mode" state and a "menu state" to be more similar to a real game. Also added action-performed indicators (`InputActionIndicator`) illustrating when actions get triggered. diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Gamepad.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Gamepad.cs index 3841c4d723..a07680d771 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Gamepad.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Gamepad.cs @@ -87,7 +87,7 @@ public struct GamepadState : IInputStateTypeInfo internal const string ButtonNorthShortDisplayName = "Triangle"; internal const string ButtonWestShortDisplayName = "Square"; internal const string ButtonEastShortDisplayName = "Circle"; - #elif UNITY_SWITCH + #elif UNITY_SWITCH || UNITY_SWITCH2 internal const string ButtonSouthShortDisplayName = "B"; internal const string ButtonNorthShortDisplayName = "X"; internal const string ButtonWestShortDisplayName = "Y";