eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved button/key remaping for game.

Browse Source
This commit is contained in:
sorgelig
2018-09-12 12:44:11 +08:00
parent 29f67b8b45
commit bf7d4a7ebf
2 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
input.cpp
View File

@@ -1196,12 +1196,12 @@ void finish_map_setting(int dismiss)
uint16_t get_map_vid()
{
return input[mapping_dev].vid;
return (mapping_dev >= 0) ? input[mapping_dev].vid : 0;
}
uint16_t get_map_pid()
{
return input[mapping_dev].pid;
return (mapping_dev >= 0) ? input[mapping_dev].pid : 0;
}
static char kr_fn_table[] =
@@ -1531,18 +1531,17 @@ static void input_cb(struct input_event *ev, struct input_absinfo *absinfo, int
}
else if (mapping_type == 3)
{
if (!mapping_button)
if (ev->value == 1)
{
if (ev->code >= 256)
if (!mapping_button)
{
if (mapping_dev < 0) mapping_dev = dev;
if (mapping_dev == dev && ev->code < 1024) mapping_button = ev->code;
}
}
else
{
if (ev->code < 256 && mapping_dev >= 0)
else if (mapping_dev >= 0 && (ev->code<256 || mapping_dev == dev))
{
// Technically it's hard to map the key to button as keyboards
// are all the same while joysticks are personalized and numbered.
input[mapping_dev].jkmap[mapping_button] = ev->code;
mapping_button = 0;
}
@@ -1594,7 +1593,6 @@ static void input_cb(struct input_event *ev, struct input_absinfo *absinfo, int
switch (ev->type)
{
case EV_KEY:
if (ev->code < 1024 && input[dev].jkmap[ev->code] && !user_io_osd_is_visible()) ev->code = input[dev].jkmap[ev->code];
//joystick buttons, digital directions