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

Merge pull request #1375 from Azaezel/alpha41/conoleCleanups

Browse source 
Don't report keybinds unless asked
This commit is contained in:
Brian Roberts 2025-01-30 17:31:15 -06:00 • committed by GitHub
commit f71f4e051f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/core/clientServer/Core_ClientServer.tscript
View file

@ -119,11 +119,11 @@ function Core_ClientServer::onDestroy( %this )
sfxShutdown(); sfxShutdown();
echo("Exporting client prefs");
%prefPath = getPrefpath(); %prefPath = getPrefpath();
echo("Exporting client prefs to "@ getUserHomeDirectory() @ "/clientPrefs." @ $TorqueScriptFileExtension);
export("$pref::*", %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension, false); export("$pref::*", %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension, false);
echo("Exporting server prefs"); echo("Exporting server prefs to "@ getUserHomeDirectory() @ "/serverPrefs." @ $TorqueScriptFileExtension);
export("$Pref::Server::*", %prefPath @ "/serverPrefs." @ $TorqueScriptFileExtension, false); export("$Pref::Server::*", %prefPath @ "/serverPrefs." @ $TorqueScriptFileExtension, false);
BanList::Export(%prefPath @ "/banlist." @ $TorqueScriptFileExtension); BanList::Export(%prefPath @ "/banlist." @ $TorqueScriptFileExtension);
} }

2
Templates/BaseGame/game/core/clientServer/scripts/server/server.tscript
View file

@ -251,7 +251,7 @@ function destroyServer()
// Save any server settings // Save any server settings
%prefPath = getPrefpath(); %prefPath = getPrefpath();
echo( "Exporting server prefs..." ); echo( "Exporting server prefs to "@ getUserHomeDirectory() @ "/serverPrefs." @ $TorqueScriptFileExtension );
export( "$Pref::Server::*", %prefPath@"/serverPrefs." @ $TorqueScriptFileExtension, false ); export( "$Pref::Server::*", %prefPath@"/serverPrefs." @ $TorqueScriptFileExtension, false );
BanList::Export(%prefPath@"/banlist." @ $TorqueScriptFileExtension); BanList::Export(%prefPath@"/banlist." @ $TorqueScriptFileExtension);

2
Templates/BaseGame/game/data/UI/guis/joinServerMenu.tscript
View file

@ -11,8 +11,8 @@ function JoinServerMenu::onWake(%this)
function JoinServerMenu::onSleep(%this) function JoinServerMenu::onSleep(%this)
{ {
echo("Exporting client prefs");
%prefPath = getPrefpath(); %prefPath = getPrefpath();
echo("Exporting client prefs to "@ getUserHomeDirectory() @ "/clientPrefs." @ $TorqueScriptFileExtension);
export("$pref::*", %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension, false); export("$pref::*", %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension, false);
} }

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

@ -1,3 +1,4 @@
$reportKeymapping = false;
$optionsEntryPad = 10; $optionsEntryPad = 10;
$OptionsMenuCategories[0] = "Video"; $OptionsMenuCategories[0] = "Video";
@ -672,8 +673,8 @@ function OptionsMenu::populateKeybinds(%this, %device, %controlsList)
%keyMap = buildFullMapString( %i, $RemapActionMap[%i], %device ); %keyMap = buildFullMapString( %i, $RemapActionMap[%i], %device );
%description = $RemapDescription[%i]; %description = $RemapDescription[%i];
if ($reportKeymapping)
echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description); echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description);
%remapEntry = addActionMapEntry(%actionMapName, %device, %keyMap, %i, %description); %remapEntry = addActionMapEntry(%actionMapName, %device, %keyMap, %i, %description);
%controlsList.add(%remapEntry); %controlsList.add(%remapEntry);
@ -1074,7 +1075,8 @@ function addActionMapEntry(%actionMap, %device, %keyMap, %index, %description)
}; };
%buttonContainer = %entry.findObjectByInternalName("valuesContainer"); %buttonContainer = %entry.findObjectByInternalName("valuesContainer");
echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1))); if ($reportKeymapping)
echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1)));
if(getWordCount(getField(%keyMap, 1)) == 2) if(getWordCount(getField(%keyMap, 1)) == 2)
{ {
%modifierBtn = new GuiIconButtonCtrl() { %modifierBtn = new GuiIconButtonCtrl() {