asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3880 from Hinsbart/joy_names

Browse source 
use joystick name from mapping-db if available
This commit is contained in:
Rémi Verschelde 2016-02-29 17:38:55 +01:00
commit c0382a1731
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/input_default.cpp
View file

@ -173,6 +173,7 @@ void InputDefault::joy_connection_changed(int p_idx, bool p_connected, String p_
for (int i=0; i < map_db.size(); i++) {
if (js.uid == map_db[i].uid) {
mapping = i;
js.name = map_db[i].name;
//printf("found mapping\n");
};
};
@ -826,6 +827,7 @@ void InputDefault::parse_mapping(String p_mapping) {
uid.resize(17);
mapping.uid = entry[0];
mapping.name = entry[1];
int idx = 1;
while (++idx < entry.size()) {

1
main/input_default.h
View file

@ -102,6 +102,7 @@ private:
struct JoyDeviceMapping {
String uid;
String name;
Map<int,JoyEvent> buttons;
Map<int,JoyEvent> axis;
JoyEvent hat[HAT_MAX];