sinamas/gambatte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SDL handling of joystick hats

Browse Source 
This code was broken in two places. First, the --input parsing always
skipped hats due to missing break statements in the direction switch.
Second, the handler for SDL_JoyHatEvents was iterating through the axis
map instead of the hat map.
This commit is contained in:
Brandon Mulcahy 2016-06-23 14:00:26 -04:00
parent f8a810b103
commit df356c14b6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gambatte_sdl/src/gambatte_sdl.cpp
View File

@ -369,10 +369,10 @@ void InputOption::exec(char const *const *argv, int index) {
break;
case 'h':
switch (dir) {
case 'u': id.jdata.dir = JoyData::dir_up;
case 'd': id.jdata.dir = JoyData::dir_down;
case 'l': id.jdata.dir = JoyData::dir_left;
case 'r': id.jdata.dir = JoyData::dir_right;
case 'u': id.jdata.dir = JoyData::dir_up; break;
case 'd': id.jdata.dir = JoyData::dir_down; break;
case 'l': id.jdata.dir = JoyData::dir_left; break;
case 'r': id.jdata.dir = JoyData::dir_right; break;
default: continue;
}
@ -723,7 +723,7 @@ bool GambatteSdl::handleEvents(BlitterWrapper &blitter) {
jd.num = e.jhat.hat;
for (std::pair<jmap_t::iterator, jmap_t::iterator> range =
jaMap.equal_range(jd); range.first != range.second; ++range.first) {
jhMap.equal_range(jd); range.first != range.second; ++range.first) {
if (e.jhat.value & range.first->first.dir)
inputGetter.is |= range.first->second;
else