mirror of
https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
synced 2024-11-14 10:50:13 +01:00
Allow action names to be used in more than one action set at the same time.
This commit is contained in:
parent
141dfba191
commit
663728edca
1 changed files with 12 additions and 2 deletions
|
@ -145,7 +145,12 @@ public ISteamInput
|
|||
if (digital != button_strings.end()) {
|
||||
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);
|
||||
} else {
|
||||
auto analog = analog_strings.find(button_string);
|
||||
|
@ -164,7 +169,12 @@ public ISteamInput
|
|||
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].second = source_mode;
|
||||
|
||||
|
|
Loading…
Reference in a new issue