TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-07 14:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update optionsMenu.tscript

Browse source 
Fixed re-mappable binds with "mouse" as the device not showing up in the menu.
This commit is contained in:
Sir-Skurpsalot 2025-12-09 18:35:43 -07:00 • committed by GitHub
parent 2e291d8ab2
commit 6526e87724
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
View file

@ -583,7 +583,7 @@ function OptionsMenu::populateAudioSettings(%this)
function OptionsMenu::populateKBMControls(%this)
{
%this.populateKeybinds("keyboard", KBMControlsList);
%this.populateKeybinds("keyboard" TAB "mouse", KBMControlsList);
%this.syncGui();
@ -599,7 +599,7 @@ function OptionsMenu::populateGamepadControls(%this)
GamepadControlsList.syncGui();
}
function OptionsMenu::populateKeybinds(%this, %device, %controlsList)
function OptionsMenu::populateKeybinds(%this, %devices, %controlsList)
{
%controlsList.clear();
@ -662,21 +662,30 @@ function OptionsMenu::populateKeybinds(%this, %device, %controlsList)
for ( %i = 0; %i < $RemapCount; %i++ )
{
if(%device !$= "" && %device !$= $RemapDevice[%i])
%entryDevice = "";
//Check each field of %devices for device matching the remappable action
foreach$(%d in %devices){
if(%d $= $RemapDevice[%i]) {
%entryDevice = %d;
break;
}
}
//If there was no match go to the next remappable action
if(%entryDevice $= "")
continue;
%actionMapName = $RemapActionMap[%i].humanReadableName $= "" ? $RemapActionMap[%i].getName() : $RemapActionMap[%i].humanReadableName;
%actionMapName = $RemapActionMap[%i].humanReadableName $= "" ? $RemapActionMap[%i].getName() : $RemapActionMap[%i].humanReadableName;
if(%currentActionMap !$= %actionMapName)
continue;
%keyMap = buildFullMapString( %i, $RemapActionMap[%i], %device );
%keyMap = buildFullMapString( %i, $RemapActionMap[%i], %entryDevice );
%description = $RemapDescription[%i];
if ($reportKeymapping)
echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description);
%remapEntry = addActionMapEntry(%actionMapName, %device, %keyMap, %i, %description);
echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %entryDevice @ " | " @ %keymap @ " | " @ %description);
%remapEntry = addActionMapEntry(%actionMapName, %entryDevice, %keyMap, %i, %description);
%controlsList.add(%remapEntry);
}
}
@ -1132,4 +1141,4 @@ function addActionMapEntry(%actionMap, %device, %keyMap, %index, %description)
}
return %entry;
}
}