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

Merge pull request #973 from AtomicWalrus/KeyBindingScriptFixes

Browse source 
Key rebinding script fixes
This commit is contained in:
Brian Roberts 2023-02-26 14:27:43 -06:00 • committed by GitHub
commit a51bccf222
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,7 +193,7 @@ function OptionsMenu::apply(%this)
if(%actionMap == GlobalActionMap.getId()) if(%actionMap == GlobalActionMap.getId())
continue; continue;
%actionMapName = %actionMap.humanReadableName $= "" ? %actionMap.getName() : %actionMap.humanReadableName; %actionMapName = %actionMap.getName();
if(%actionMapName $= %targetVar) if(%actionMapName $= %targetVar)
{ {
%hasKeybindChanges = true; %hasKeybindChanges = true;
@ -959,7 +959,7 @@ function OptionsMenuSettingsList::addSliderRow(%this, %label, %targetPrefVar, %i
%this.add(%option); %this.add(%option);
} }
function OptionsMenuSettingsList::addKeybindRow(%this, %label, %bitmapName, %callback, %enabled, %description) function OptionsMenuSettingsList::addKeybindRow(%this, %label, %bitmapName, %callback, %enabled, %description, %remapIndex)
{ {
if(%enabled $= "") if(%enabled $= "")
%enabled = true; %enabled = true;
@ -978,6 +978,8 @@ function OptionsMenuSettingsList::addKeybindRow(%this, %label, %bitmapName, %cal
useMouseEvents = true; useMouseEvents = true;
}; };
%option.remapIndex = %remapIndex;
%option.setKeybindSetting(%label, %bitmapName, %callback, %enabled, %description); %option.setKeybindSetting(%label, %bitmapName, %callback, %enabled, %description);
%this.add(%option); %this.add(%option);

5
Templates/BaseGame/game/data/UI/scripts/controlsMenu.tscript
View file

@ -192,7 +192,7 @@ function fillRemapList()
%buttonImageAsset = getButtonBitmap(%device, getField(%keyMap, 1)); %buttonImageAsset = getButtonBitmap(%device, getField(%keyMap, 1));
OptionsMenuSettingsList.addKeybindRow(getField(%keyMap, 0), %buttonImageAsset, "doKeyRemap", true, %description); OptionsMenuSettingsList.addKeybindRow(getField(%keyMap, 0), %buttonImageAsset, "doKeyRemap", true, %description, %i);
} }
//OptionsMenuSettingsList.refresh(); //OptionsMenuSettingsList.refresh();
@ -207,8 +207,7 @@ function controlSetChanged()
function doKeyRemap( %row ) function doKeyRemap( %row )
{ {
%rowIndex = %row.getParent().getObjectIndex(%row); %rowIndex = %row.remapIndex;
%rowIndex--; //Offset the rowIndex to account for controlset option
%name = $RemapName[%rowIndex]; %name = $RemapName[%rowIndex];
RemapDlg-->OptRemapText.text = "Re-bind \"" @ %name @ "\" to..." ; RemapDlg-->OptRemapText.text = "Re-bind \"" @ %name @ "\" to..." ;