mirror/goldberg_emulator
1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git synced 2024-12-03 16:48:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow action names to be used in more than one action set at the same time.

Browse source
This commit is contained in:
Mr_Goldberg 2019-09-11 09:08:05 -04:00
parent 141dfba191
commit 663728edca
No known key found for this signature in database
GPG key ID: 8597D87419DEF278
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dll/steam_controller.h
View file

@ -145,7 +145,12 @@ public ISteamInput
if (digital != button_strings.end()) { if (digital != button_strings.end()) {
ControllerDigitalActionHandle_t digital_handle_num = current_handle_num; ControllerDigitalActionHandle_t digital_handle_num = current_handle_num;
digital_action_handles[config_key.first] = digital_handle_num; if (digital_action_handles.find(config_key.first) == digital_action_handles.end()) {
digital_action_handles[config_key.first] = digital_handle_num;
} else {
digital_handle_num = digital_action_handles[config_key.first];
}
controller_maps[action_handle_num].active_digital[digital_handle_num].insert(digital->second); controller_maps[action_handle_num].active_digital[digital_handle_num].insert(digital->second);
} else { } else {
auto analog = analog_strings.find(button_string); auto analog = analog_strings.find(button_string);
@ -164,7 +169,12 @@ public ISteamInput
source_mode = input_mode->second; source_mode = input_mode->second;
} }
analog_action_handles[config_key.first] = analog_handle_num; if (analog_action_handles.find(config_key.first) == analog_action_handles.end()) {
analog_action_handles[config_key.first] = analog_handle_num;
} else {
analog_handle_num = analog_action_handles[config_key.first];
}
controller_maps[action_handle_num].active_analog[analog_handle_num].first.insert(analog->second); controller_maps[action_handle_num].active_analog[analog_handle_num].first.insert(analog->second);
controller_maps[action_handle_num].active_analog[analog_handle_num].second = source_mode; controller_maps[action_handle_num].active_analog[analog_handle_num].second = source_mode;