From 2b342b55bde655861d38df3960e4db9d7451b3ef Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 10 Sep 2025 22:02:29 +1000 Subject: [PATCH] PS2/Xbox/Xbox 360: Change L to place and R to delete for consistency with console editions NDS: B+L/R also move hotbar too --- src/nds/Window_NDS.c | 4 ++-- src/ps1/Window_PS1.c | 22 +++++++++++----------- src/ps2/Window_PS2.c | 4 ++-- src/ps3/Window_PS3.c | 4 ++-- src/xbox/Window_Xbox.c | 4 ++-- src/xbox360/Window_Xbox360.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/nds/Window_NDS.c b/src/nds/Window_NDS.c index a55f381e1..58d5e295b 100644 --- a/src/nds/Window_NDS.c +++ b/src/nds/Window_NDS.c @@ -272,8 +272,8 @@ static const BindMapping defaults_nds[BIND_COUNT] = { [BIND_NOCLIP] = { CCPAD_2, CCPAD_3 }, [BIND_FLY_UP] = { CCPAD_2, CCPAD_UP }, [BIND_FLY_DOWN] = { CCPAD_2, CCPAD_DOWN }, - [BIND_HOTBAR_LEFT] = { CCPAD_ZL }, - [BIND_HOTBAR_RIGHT] = { CCPAD_ZR } + [BIND_HOTBAR_LEFT] = { CCPAD_2, CCPAD_LEFT }, + [BIND_HOTBAR_RIGHT] = { CCPAD_2, CCPAD_RIGHT } }; void Gamepads_Init(void) { diff --git a/src/ps1/Window_PS1.c b/src/ps1/Window_PS1.c index 71f69ab90..41952b1fc 100644 --- a/src/ps1/Window_PS1.c +++ b/src/ps1/Window_PS1.c @@ -142,22 +142,22 @@ static const BindMapping pad_defaults[BIND_COUNT] = { [BIND_LOOK_DOWN] = { CCPAD_4, CCPAD_DOWN }, [BIND_LOOK_LEFT] = { CCPAD_4, CCPAD_LEFT }, [BIND_LOOK_RIGHT] = { CCPAD_4, CCPAD_RIGHT }, - [BIND_FORWARD] = { CCPAD_UP, 0 }, - [BIND_BACK] = { CCPAD_DOWN, 0 }, - [BIND_LEFT] = { CCPAD_LEFT, 0 }, - [BIND_RIGHT] = { CCPAD_RIGHT, 0 }, - [BIND_JUMP] = { CCPAD_1, 0 }, - [BIND_SET_SPAWN] = { CCPAD_START, 0 }, - [BIND_INVENTORY] = { CCPAD_3, 0 }, + [BIND_FORWARD] = { CCPAD_UP }, + [BIND_BACK] = { CCPAD_DOWN }, + [BIND_LEFT] = { CCPAD_LEFT }, + [BIND_RIGHT] = { CCPAD_RIGHT }, + [BIND_JUMP] = { CCPAD_1 }, + [BIND_SET_SPAWN] = { CCPAD_START }, + [BIND_INVENTORY] = { CCPAD_3 }, [BIND_SPEED] = { CCPAD_2, CCPAD_L }, [BIND_NOCLIP] = { CCPAD_2, CCPAD_3 }, [BIND_FLY] = { CCPAD_2, CCPAD_R }, [BIND_FLY_UP] = { CCPAD_2, CCPAD_UP }, [BIND_FLY_DOWN] = { CCPAD_2, CCPAD_DOWN }, - [BIND_PLACE_BLOCK] = { CCPAD_L, 0 }, - [BIND_DELETE_BLOCK] = { CCPAD_R, 0 }, - [BIND_HOTBAR_LEFT] = { CCPAD_ZL, 0 }, - [BIND_HOTBAR_RIGHT] = { CCPAD_ZR, 0 } + [BIND_PLACE_BLOCK] = { CCPAD_L }, + [BIND_DELETE_BLOCK] = { CCPAD_R }, + [BIND_HOTBAR_LEFT] = { CCPAD_ZL }, + [BIND_HOTBAR_RIGHT] = { CCPAD_ZR } }; static char pad_buff[2][34]; diff --git a/src/ps2/Window_PS2.c b/src/ps2/Window_PS2.c index 4bd1fe94d..990f0444d 100644 --- a/src/ps2/Window_PS2.c +++ b/src/ps2/Window_PS2.c @@ -237,8 +237,8 @@ static const BindMapping defaults_ps2[BIND_COUNT] = { [BIND_CHAT] = { CCPAD_4 }, [BIND_INVENTORY] = { CCPAD_3 }, [BIND_SEND_CHAT] = { CCPAD_START }, - [BIND_DELETE_BLOCK] = { CCPAD_L }, - [BIND_PLACE_BLOCK] = { CCPAD_R }, + [BIND_PLACE_BLOCK] = { CCPAD_L }, + [BIND_DELETE_BLOCK] = { CCPAD_R }, [BIND_SPEED] = { CCPAD_2, CCPAD_L }, [BIND_FLY] = { CCPAD_2, CCPAD_R }, [BIND_NOCLIP] = { CCPAD_2, CCPAD_3 }, diff --git a/src/ps3/Window_PS3.c b/src/ps3/Window_PS3.c index e7de5ce1c..68078be90 100644 --- a/src/ps3/Window_PS3.c +++ b/src/ps3/Window_PS3.c @@ -281,8 +281,8 @@ static const BindMapping defaults_ps3[BIND_COUNT] = { [BIND_CHAT] = { CCPAD_4 }, [BIND_INVENTORY] = { CCPAD_3 }, [BIND_SEND_CHAT] = { CCPAD_START }, - [BIND_DELETE_BLOCK] = { CCPAD_L }, - [BIND_PLACE_BLOCK] = { CCPAD_R }, + [BIND_PLACE_BLOCK] = { CCPAD_L }, + [BIND_DELETE_BLOCK] = { CCPAD_R }, [BIND_SPEED] = { CCPAD_2, CCPAD_L }, [BIND_FLY] = { CCPAD_2, CCPAD_R }, [BIND_NOCLIP] = { CCPAD_2, CCPAD_3 }, diff --git a/src/xbox/Window_Xbox.c b/src/xbox/Window_Xbox.c index fef5d7324..038d31377 100644 --- a/src/xbox/Window_Xbox.c +++ b/src/xbox/Window_Xbox.c @@ -96,8 +96,8 @@ static const BindMapping defaults_xbox[BIND_COUNT] = { [BIND_CHAT] = { CCPAD_4 }, [BIND_INVENTORY] = { CCPAD_3 }, [BIND_SEND_CHAT] = { CCPAD_START }, - [BIND_DELETE_BLOCK] = { CCPAD_L }, - [BIND_PLACE_BLOCK] = { CCPAD_R }, + [BIND_PLACE_BLOCK] = { CCPAD_L }, + [BIND_DELETE_BLOCK] = { CCPAD_R }, [BIND_SPEED] = { CCPAD_2, CCPAD_L }, [BIND_FLY] = { CCPAD_2, CCPAD_R }, [BIND_NOCLIP] = { CCPAD_2, CCPAD_3 }, diff --git a/src/xbox360/Window_Xbox360.c b/src/xbox360/Window_Xbox360.c index 910c4977b..75f1c4559 100644 --- a/src/xbox360/Window_Xbox360.c +++ b/src/xbox360/Window_Xbox360.c @@ -95,8 +95,8 @@ static const BindMapping defaults_xbox360[BIND_COUNT] = { [BIND_CHAT] = { CCPAD_4 }, [BIND_INVENTORY] = { CCPAD_3 }, [BIND_SEND_CHAT] = { CCPAD_START }, - [BIND_DELETE_BLOCK] = { CCPAD_L }, - [BIND_PLACE_BLOCK] = { CCPAD_R }, + [BIND_PLACE_BLOCK] = { CCPAD_L }, + [BIND_DELETE_BLOCK] = { CCPAD_R }, [BIND_SPEED] = { CCPAD_2, CCPAD_L }, [BIND_FLY] = { CCPAD_2, CCPAD_R }, [BIND_NOCLIP] = { CCPAD_2, CCPAD_3 },