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

Format joystick indices as unsigned values

Browse source
This commit is contained in:
Kp 2019-04-13 18:00:07 +00:00
parent e61100a858
commit 645daa2304
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -328,10 +328,9 @@ void joy_init()
#if DXX_MAX_BUTTONS_PER_JOYSTICK
range_for (auto &&e, enumerate(partial_range(joystick.button_map(), n_buttons), 1))
{
cf_assert(e.idx <= DXX_MAX_BUTTONS_PER_JOYSTICK);
auto &text = joybutton_text[joystick_n_buttons];
e.value = joystick_n_buttons++;
snprintf(&text[0], sizeof(text), "J%d B%d", i + 1, e.idx);
snprintf(&text[0], sizeof(text), "J%u B%u", i + 1, e.idx);
}
#endif
#if DXX_MAX_HATS_PER_JOYSTICK
@ -340,10 +339,10 @@ void joy_init()
e.value = joystick_n_buttons;
cf_assert(e.idx <= DXX_MAX_HATS_PER_JOYSTICK);
//a hat counts as four buttons
snprintf(&joybutton_text[joystick_n_buttons++][0], sizeof(joybutton_text[0]), "J%d H%d%c", i + 1, e.idx, 0202);
snprintf(&joybutton_text[joystick_n_buttons++][0], sizeof(joybutton_text[0]), "J%d H%d%c", i + 1, e.idx, 0177);
snprintf(&joybutton_text[joystick_n_buttons++][0], sizeof(joybutton_text[0]), "J%d H%d%c", i + 1, e.idx, 0200);
snprintf(&joybutton_text[joystick_n_buttons++][0], sizeof(joybutton_text[0]), "J%d H%d%c", i + 1, e.idx, 0201);
snprintf(&joybutton_text[joystick_n_buttons++][0], sizeof(joybutton_text[0]), "J%u H%u%c", i + 1, e.idx, 0202);
snprintf(&joybutton_text[joystick_n_buttons++][0], sizeof(joybutton_text[0]), "J%u H%u%c", i + 1, e.idx, 0177);
snprintf(&joybutton_text[joystick_n_buttons++][0], sizeof(joybutton_text[0]), "J%u H%u%c", i + 1, e.idx, 0200);
snprintf(&joybutton_text[joystick_n_buttons++][0], sizeof(joybutton_text[0]), "J%u H%u%c", i + 1, e.idx, 0201);
}
#endif
#endif