The-Homebrew-Cloud
/
uae-wii
mirror of https://github.com/Oibaf66/uae-wii.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Rumble array warning, disabled Gamepad 2 as default configuration, enabled pad in gamepad 1

This commit is contained in:
fabio.olimpieri 2015-01-18 14:46:32 +00:00
parent 11f44c1f36
commit ba18cea037
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jd-sdl/joystick.c
View File

@ -41,7 +41,7 @@ void Rumble(unsigned int nr, unsigned int i, int bs)
Uint32 cur_ticks;
static bool rumble_on[2];
static bool fire_pressed[2];
static int joystickbutton_fire[2]={-1,-1,-1,-1,-1,-1};
static int joystickbutton_fire[2]={-1,-1};
int kc;
if (nr>1) return;

16
uaerc.wii
View File

@ -122,7 +122,7 @@ input.1.keyboard.0.button.96=SPC_ENTERGUI
input.1.mouse.0.disabled=0
input.1.mouse.0.axis.0=MOUSE1_HORIZ
input.1.mouse.0.axis.1=MOUSE1_VERT
input.1.mouse.0.axis.2=MOUSE1_WHEEL
#input.1.mouse.0.axis.2=MOUSE1_WHEEL
# Mouse 2 disabled by default since Wii SDL uses wiimote 1 only
input.1.mouse.1.disabled=1
@ -205,21 +205,21 @@ input.1.joystick.4.button.7=SPC_ENTERGUI
#input.1.joystick.4.button.1=JOY2_2ND_BUTTON
# The "hat" on the gamepad (dpad)
#input.1.joystick.4.axis.6=JOY2_HORIZ
#input.1.joystick.4.axis.7=JOY2_VERT
input.1.joystick.4.axis.6=JOY2_HORIZ
input.1.joystick.4.axis.7=JOY2_VERT
#GAME PAD 2 as Joystick 1
input.1.joystick.5.disabled=0
input.1.joystick.5.axis.0=JOY1_HORIZ
input.1.joystick.5.axis.1=JOY1_VERT
#input.1.joystick.5.disabled=0
#input.1.joystick.5.axis.0=JOY1_HORIZ
#input.1.joystick.5.axis.1=JOY1_VERT
#The C Joystick
#input.1.joystick.5.axis.2=JOY2_HORIZ
#input.1.joystick.5.axis.3=JOY2_VERT
#Buttons A, start and B
input.1.joystick.5.button.0=JOY1_FIRE_BUTTON
input.1.joystick.5.button.7=SPC_ENTERGUI
#input.1.joystick.5.button.0=JOY1_FIRE_BUTTON
#input.1.joystick.5.button.7=SPC_ENTERGUI
#input.1.joystick.5.button.1=JOY2_2ND_BUTTON
# The "hat" on the gamepad (dpad)