diff --git a/src/gui-sdl/gui-sdl.c b/src/gui-sdl/gui-sdl.c index 04ba71e..b9784d1 100644 --- a/src/gui-sdl/gui-sdl.c +++ b/src/gui-sdl/gui-sdl.c @@ -391,7 +391,7 @@ static void insert_keyboard_map(const char *key, const char *fmt, ...) static void setup_joystick_defaults(int joy) { - int fire_buttons[] = {3,7,9,10}; + int fire_buttons[] = {3,7,9}; int i; /* For some reason, the user uaerc removes these. The following diff --git a/uaerc.wii b/uaerc.wii index d2e1e36..fbde1fb 100644 --- a/uaerc.wii +++ b/uaerc.wii @@ -74,12 +74,10 @@ input.1.joystick.0.axis.5=JOY2_VERT input.1.joystick.0.axis.6=JOY2_HORIZ input.1.joystick.0.axis.7=JOY2_VERT -# 2 on wiimote, Z on nunchuck and a/b on the classic controller +# 2 on wiimote, Z on nunchuck and a on the classic controller input.1.joystick.0.button.3=JOY2_FIRE_BUTTON input.1.joystick.0.button.7=JOY2_FIRE_BUTTON input.1.joystick.0.button.9=JOY2_FIRE_BUTTON -input.1.joystick.0.button.10=JOY2_FIRE_BUTTON - # Wiimote 2 input.1.joystick.1.disabled=0