ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added nbr_joy variable for interfaces using joysticks.

This commit is contained in:
evilynux 2007-01-12 23:44:23 +00:00
parent 96040fecb6
commit 12b0460342
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/ctrlssdl.c
View File

@ -24,7 +24,7 @@
/* Initialize joysticks */ /* Initialize joysticks */
BOOL init_joy(u16 joyCfg[]) { BOOL init_joy(u16 joyCfg[]) {
int i, nbJoysticks; int i;
/* Joystick configuration */ /* Joystick configuration */
memcpy(joypadCfg, joyCfg, sizeof(joypadCfg)); memcpy(joypadCfg, joyCfg, sizeof(joypadCfg));
@ -36,10 +36,10 @@ BOOL init_joy(u16 joyCfg[]) {
return FALSE; return FALSE;
} }
nbJoysticks = SDL_NumJoysticks(); nbr_joy = SDL_NumJoysticks();
printf("Nbr of joysticks: %d\n\n", nbJoysticks); printf("Nbr of joysticks: %d\n\n", nbr_joy);
for (i = 0; i < nbJoysticks; i++) for (i = 0; i < nbr_joy; i++)
{ {
SDL_Joystick * joy = SDL_JoystickOpen(i); SDL_Joystick * joy = SDL_JoystickOpen(i);
printf("Joystick %s\n", i, SDL_JoystickName(i)); printf("Joystick %s\n", i, SDL_JoystickName(i));

1
desmume/src/ctrlssdl.h
View File

@ -38,6 +38,7 @@
#define KEYMASK_(k) (1 << k) #define KEYMASK_(k) (1 << k)
u16 joypadCfg[NB_KEYS]; u16 joypadCfg[NB_KEYS];
u16 nbr_joy;
#ifndef GTK_UI #ifndef GTK_UI
struct mouse_status struct mouse_status