From 0d24afb9b8d3d4bb1e630aaad2b3b67c78e4daed Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Thu, 21 Dec 2023 20:47:32 +1100 Subject: [PATCH] Webclient: Fix L/R and ZL/ZR being swapped --- readme.md | 2 +- src/Window_Web.c | 8 ++++---- src/interop_BeOS.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/readme.md b/readme.md index 0f408953c..e2282e236 100644 --- a/readme.md +++ b/readme.md @@ -361,7 +361,7 @@ Further information (e.g. style) for ClassiCube's source code can be found in th * [cen64](https://github.com/n64dev/cen64) - Emulator used to test Nintendo 64 port * [ares](https://github.com/ares-emulator/ares) - Emulator used to test Nintendo 64 port * [ps2sdk](https://github.com/ps2dev/ps2sdk) - Backend for PS2 -* [PCSX2](https://github.com/ps2dev/ps2sdk) - Emulator used to test PS2 port +* [PCSX2](https://github.com/PCSX2/pcsx2) - Emulator used to test PS2 port ## Sound Credits diff --git a/src/Window_Web.c b/src/Window_Web.c index 6cd73d9ff..fa6282f52 100644 --- a/src/Window_Web.c +++ b/src/Window_Web.c @@ -535,10 +535,10 @@ static void ProcessGamepadButtons(EmscriptenGamepadEvent* ev) { Input_SetNonRepeatable(CCPAD_X, GetGamepadButton(2)); Input_SetNonRepeatable(CCPAD_Y, GetGamepadButton(3)); - Input_SetNonRepeatable(CCPAD_L, GetGamepadButton(4)); - Input_SetNonRepeatable(CCPAD_R, GetGamepadButton(5)); - Input_SetNonRepeatable(CCPAD_ZL, GetGamepadButton(6)); - Input_SetNonRepeatable(CCPAD_ZR, GetGamepadButton(7)); + Input_SetNonRepeatable(CCPAD_ZL, GetGamepadButton(4)); + Input_SetNonRepeatable(CCPAD_ZR, GetGamepadButton(5)); + Input_SetNonRepeatable(CCPAD_L, GetGamepadButton(6)); + Input_SetNonRepeatable(CCPAD_R, GetGamepadButton(7)); Input_SetNonRepeatable(CCPAD_SELECT, GetGamepadButton( 8)); Input_SetNonRepeatable(CCPAD_START, GetGamepadButton( 9)); diff --git a/src/interop_BeOS.cpp b/src/interop_BeOS.cpp index 721efaaba..e4f00043d 100644 --- a/src/interop_BeOS.cpp +++ b/src/interop_BeOS.cpp @@ -705,7 +705,7 @@ void Window_AllocFramebuffer(struct Bitmap* bmp) { void Window_DrawFramebuffer(Rect2D r) { // TODO rect should maybe subtract -1 too ???? - BRect rect(r.X, r.Y, r.X + r.Width, r.Y + r.Height); + BRect rect(r.x, r.y, r.x + r.Width, r.y + r.Height); win_handle->Lock(); view_handle->DrawBitmap(win_framebuffer, rect, rect); win_handle->Unlock();