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

Merge commit '4344d6d55d' into dev-hats

Browse source 
* commit '4344d6d55d':
  Fixed inversed Parallel Port Axis mapping (port 2<->3)
  Fixed indentation in options
This commit is contained in:
HoraceAndTheSpider 2018-03-11 18:01:41 +00:00
commit e5f0d466b4
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/include/options.h
View file

@ -55,19 +55,19 @@ struct uae_input_device {
struct joypad_map_layout {
int south_action = 0;
int east_action = 0;
int east_action = 0;
int west_action = 0;
int north_action = 0;
int left_shoulder_action = 0;
int north_action = 0;
int left_shoulder_action = 0;
int right_shoulder_action = 0;
int start_action = 0;
int select_action = 0;
int dpad_left_action = 0;
int start_action = 0;
int select_action = 0;
int dpad_left_action = 0;
int dpad_right_action = 0;
int dpad_up_action = 0;
int dpad_down_action = 0;
int lstick_select_action = 0;
int rstick_select_action = 0;
int lstick_select_action = 0;
int rstick_select_action = 0;
};
#define MAX_JPORTS 4

4
src/osdep/amiberry_input.cpp
View file

@ -1235,8 +1235,8 @@ int input_get_default_joystick(struct uae_input_device* uid, const int num, int
{
for (auto n = 0; n < 2; ++n)
{
h = port - 2 ? INPUTEVENT_PAR_JOY1_HORIZ : INPUTEVENT_PAR_JOY2_HORIZ;
v = port - 2 ? INPUTEVENT_PAR_JOY1_VERT : INPUTEVENT_PAR_JOY2_VERT;
h = port - 2 ? INPUTEVENT_PAR_JOY2_HORIZ : INPUTEVENT_PAR_JOY1_HORIZ;
v = port - 2 ? INPUTEVENT_PAR_JOY2_VERT : INPUTEVENT_PAR_JOY1_VERT;
setid(uid, num, ID_AXIS_OFFSET + n * 2 + 0, 0, port, h, gp);
setid(uid, num, ID_AXIS_OFFSET + n * 2 + 1, 0, port, v, gp);
}