pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly save joystick name

Browse source
This commit is contained in:
Chips 2016-06-22 18:49:55 +00:00
parent d67a720e34
commit e5df4fff90
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/od-pandora/joystick.cpp
View file

@ -42,7 +42,7 @@ static int delay=0;
int nr_joysticks; int nr_joysticks;
const char* JoystickName[4]; char JoystickName[4][40];
static SDL_Joystick *uae4all_joy0 = 0, *uae4all_joy1 = 0 , *uae4all_joy2 = 0, *uae4all_joy3 = 0; static SDL_Joystick *uae4all_joy0 = 0, *uae4all_joy1 = 0 , *uae4all_joy2 = 0, *uae4all_joy3 = 0;
@ -291,31 +291,33 @@ void handle_joymouse(void)
void init_joystick(void) void init_joystick(void)
{ {
nr_joysticks = SDL_NumJoysticks (); nr_joysticks = SDL_NumJoysticks ();
if (nr_joysticks > 4)
nr_joysticks = 4;
if (nr_joysticks > 0) if (nr_joysticks > 0)
{ {
uae4all_joy0 = SDL_JoystickOpen (0); uae4all_joy0 = SDL_JoystickOpen (0);
JoystickName[0] = SDL_JoystickName(0); strncpy(JoystickName[0],SDL_JoystickName(0),40);
printf("Joystick0 : %s\n",JoystickName[0]); printf("Joystick0 : %s\n",JoystickName[0]);
printf(" Buttons: %i Axis: %i Hats: %i\n",SDL_JoystickNumButtons(uae4all_joy0),SDL_JoystickNumAxes(uae4all_joy0),SDL_JoystickNumHats(uae4all_joy0)); printf(" Buttons: %i Axis: %i Hats: %i\n",SDL_JoystickNumButtons(uae4all_joy0),SDL_JoystickNumAxes(uae4all_joy0),SDL_JoystickNumHats(uae4all_joy0));
} }
if (nr_joysticks > 1) if (nr_joysticks > 1)
{ {
uae4all_joy1 = SDL_JoystickOpen (1); uae4all_joy1 = SDL_JoystickOpen (1);
JoystickName[1] = SDL_JoystickName(1); strncpy(JoystickName[1],SDL_JoystickName(1),40);
printf("Joystick1 : %s\n",JoystickName[1]); printf("Joystick1 : %s\n",JoystickName[1]);
printf(" Buttons: %i Axis: %i Hats: %i\n",SDL_JoystickNumButtons(uae4all_joy1),SDL_JoystickNumAxes(uae4all_joy1),SDL_JoystickNumHats(uae4all_joy1)); printf(" Buttons: %i Axis: %i Hats: %i\n",SDL_JoystickNumButtons(uae4all_joy1),SDL_JoystickNumAxes(uae4all_joy1),SDL_JoystickNumHats(uae4all_joy1));
} }
if (nr_joysticks > 2) if (nr_joysticks > 2)
{ {
uae4all_joy2 = SDL_JoystickOpen (2); uae4all_joy2 = SDL_JoystickOpen (2);
JoystickName[2] = SDL_JoystickName(2); strncpy(JoystickName[2],SDL_JoystickName(2),40);
printf("Joystick2 : %s\n",JoystickName[2]); printf("Joystick2 : %s\n",JoystickName[2]);
printf(" Buttons: %i Axis: %i Hats: %i\n",SDL_JoystickNumButtons(uae4all_joy2),SDL_JoystickNumAxes(uae4all_joy2),SDL_JoystickNumHats(uae4all_joy2)); printf(" Buttons: %i Axis: %i Hats: %i\n",SDL_JoystickNumButtons(uae4all_joy2),SDL_JoystickNumAxes(uae4all_joy2),SDL_JoystickNumHats(uae4all_joy2));
} }
if (nr_joysticks > 3) if (nr_joysticks > 3)
{ {
uae4all_joy3 = SDL_JoystickOpen (3); uae4all_joy3 = SDL_JoystickOpen (3);
JoystickName[3] = SDL_JoystickName(3); strncpy(JoystickName[3],SDL_JoystickName(3),40);
printf("Joystick3 : %s\n",JoystickName[3]); printf("Joystick3 : %s\n",JoystickName[3]);
printf(" Buttons: %i Axis: %i Hats: %i\n",SDL_JoystickNumButtons(uae4all_joy3),SDL_JoystickNumAxes(uae4all_joy3),SDL_JoystickNumHats(uae4all_joy3)); printf(" Buttons: %i Axis: %i Hats: %i\n",SDL_JoystickNumButtons(uae4all_joy3),SDL_JoystickNumAxes(uae4all_joy3),SDL_JoystickNumHats(uae4all_joy3));
} }