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

Merge pull request #753 from Areloch/miscFixes20220327

Browse source 
Misc Fixes for 2022/03/27
This commit is contained in:
Brian Roberts 2022-03-27 04:36:49 -05:00 • committed by GitHub
commit c64671ff91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 311 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,8 @@ function OptionsMenu::onAdd(%this)
addOptionsMenuCategory("Audio", "populateAudioSettingsList();");
addOptionsMenuCategory("Keyboard & Mouse", "populateKeyboardMouseSettingsList();");
addOptionsMenuCategory("Gamepad", "populateGamepadSettingsList();");
callOnModules("populateOptionsMenuCategories", "Game");
}
function OptionsMenuSettingsList::onAdd(%this)
@ -898,7 +900,10 @@ function OptionsMenu::onKeybindChanged(%this, %actionMap, %keybind)
//
function addOptionsMenuCategory(%categoryName, %selectCallback)
{
OptionsMenu.optionsCategories.add(%categoryName, %selectCallback);
//Don't add duplicates!
%index = OptionsMenu.optionsCategories.getIndexFromKey(%categoryName);
if(%index == -1)
OptionsMenu.optionsCategories.add(%categoryName, %selectCallback);
}
function removeOptionsMenuCategory(%categoryName)