TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use array<> for d_physical_joystick hat_map, button_map

Browse source
This commit is contained in:
Kp 2015-09-29 02:41:22 +00:00
parent 46bbdd43af
commit e5dff6d63f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/arch/sdl/joy.cpp
View file

@ -47,10 +47,10 @@ struct d_physical_joystick {
int n_axes;
int n_buttons;
int n_hats;
int hat_map[MAX_HATS_PER_JOYSTICK]; //Note: Descent expects hats to be buttons, so these are indices into Joystick.buttons
array<unsigned, MAX_HATS_PER_JOYSTICK> hat_map; //Note: Descent expects hats to be buttons, so these are indices into Joystick.buttons
array<unsigned, MAX_BUTTONS_PER_JOYSTICK> button_map;
array<unsigned, MAX_AXES_PER_JOYSTICK> axis_map;
array<int, MAX_AXES_PER_JOYSTICK> axis_value;
int button_map[MAX_BUTTONS_PER_JOYSTICK];
};
}
@ -232,6 +232,8 @@ void joy_flush()
static_assert(SDL_RELEASED == uint8_t(), "SDL_RELEASED not 0.");
Joystick.button_state = {};
range_for (auto &j, SDL_Joysticks)
j.axis_value = {};
}
int event_joystick_get_button(const d_event &event)