From 7c875d9607fd40a902f948f3bf7b288523ae9b93 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Thu, 13 Feb 2020 20:32:26 +0000 Subject: [PATCH] riscos: Increase the number of supported joystick buttons --- README.RISCOS | 4 ++-- WhatsNew | 1 + docs.html | 3 +++ src/joystick/riscos/SDL_sysjoystick.c | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.RISCOS b/README.RISCOS index 26fc02ac3..35ac664e7 100644 --- a/README.RISCOS +++ b/README.RISCOS @@ -83,7 +83,7 @@ The following list is an overview of how much of the SDL is implemented. The are video - Mostly done. Doesn't cover gamma, YUV-overlay or OpenGL. Window Manager - Mostly done. SetIcon not implemented. Events - Mostly done. Resize and some joystick events missing. -Joystick - Currently assumes a single joystick with 4 buttons. +Joystick - Currently assumes a single joystick with 8 buttons. Audio - Done CDROM - Not implemented. Threads - Done @@ -115,7 +115,7 @@ SDL_EnableUNICODE Unicode translation used here is only really accurate for 7 bit characters. SDL_NumJoysticks/JoystickName etc. - Hardcoded to expect only 1 joystick with 4 buttons if the Joystick module is loaded. + Hardcoded to expect only 1 joystick with 8 buttons if the Joystick module is loaded. SDL_GetTicks Timer used has only a centisecond accuracy. This applies to other time related functions. diff --git a/WhatsNew b/WhatsNew index 4ed2f8117..da43b88ac 100644 --- a/WhatsNew +++ b/WhatsNew @@ -85,6 +85,7 @@ Changes include: - RISC OS: implement SDL_WM_IconifyWindow() - RISC OS: send SDL_APPACTIVE events when iconizing the window. - RISC OS: support creating windows with the SDL_NOFRAME flag set. +- RISC OS: increase the number of supported joystick buttons. - Configuration: fix library detection selecting wrong lib (bug 2795.) - Configuration: fix detecting dynamic library support on powerpc64le (bug 3481.) diff --git a/docs.html b/docs.html index d5501b1eb..c7b691e22 100644 --- a/docs.html +++ b/docs.html @@ -209,6 +209,9 @@

SDL 1.2.16 Release Notes

RISC OS: support creating windows with the SDL_NOFRAME flag set.

+

+ RISC OS: increase the number of supported joystick buttons. +

Configuration: fix library detection selecting wrong lib (bug 2795.)

diff --git a/src/joystick/riscos/SDL_sysjoystick.c b/src/joystick/riscos/SDL_sysjoystick.c index b4430ed88..e94dbc422 100644 --- a/src/joystick/riscos/SDL_sysjoystick.c +++ b/src/joystick/riscos/SDL_sysjoystick.c @@ -27,7 +27,7 @@ RISC OS - Joystick support by Alan Buckley (alan_baa@hotmail.com) - 10 April 2003 Note: Currently assumes joystick is present if joystick module is loaded - and that there is one joystick with four buttons. + and that there is one joystick with eight buttons. */ /* This is the system specific header for the SDL joystick API */ @@ -94,8 +94,8 @@ int SDL_SYS_JoystickOpen(SDL_Joystick *joystick) return -1; } - /* Don't know how to get exact count of buttons so assume max of 4 for now */ - joystick->nbuttons=4; + /* Don't know how to get exact count of buttons so assume max of 8 for now */ + joystick->nbuttons=8; joystick->nhats=0; joystick->nballs=0;