The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2024-11-25 21:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Partially fix joystick handling, more to come

Browse Source
This commit is contained in:
simon.kagstrom 2010-02-20 15:02:34 +00:00
parent b3f89c8f5d
commit bbc30c590d
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Src/C64_SDL.h
View File

@ -168,14 +168,12 @@ void C64::network_vblank()
remote->Tick( now - last_time_update ); remote->Tick( now - last_time_update );
if (this->network_connection_type == MASTER) { if (this->network_connection_type == MASTER) {
if (ThePrefs.JoystickSwap) if (ThePrefs.JoystickSwap)
js = &TheCIA1->Joystick1;
else
js = &TheCIA1->Joystick2; js = &TheCIA1->Joystick2;
else
js = &TheCIA1->Joystick1;
} else { } else {
if (ThePrefs.JoystickSwap) /* Both are the same */
js = &TheCIA1->Joystick2; js = &TheCIA1->Joystick2;
else
js = &TheCIA1->Joystick1;
} }
remote->ResetNetworkUpdate(); remote->ResetNetworkUpdate();
@ -268,21 +266,10 @@ void C64::VBlank(bool draw_frame)
else else
j2 &= joykey; j2 &= joykey;
if (this->network_connection_type == MASTER) if (this->network_connection_type == CLIENT)
{ {
/* Only poll one joystick for network servers */ Uint8 which = j1;
if (ThePrefs.JoystickSwap)
TheCIA1->Joystick2 = j2;
else
TheCIA1->Joystick1 = j2;
}
else if (this->network_connection_type == CLIENT)
{
Uint8 which = j2;
/* Set both joysticks to the updated value */
if (j2 != 0xff)
which = j2;
TheCIA1->Joystick1 = which; TheCIA1->Joystick1 = which;
TheCIA1->Joystick2 = which; TheCIA1->Joystick2 = which;
} }