Преглед изворни кода

Merge pull request #1375 from Azaezel/alpha41/conoleCleanups

Don't report keybinds unless asked
Brian Roberts пре 7 месеци
родитељ
комит
f71f4e051f

+ 2 - 2
Templates/BaseGame/game/core/clientServer/Core_ClientServer.tscript

@@ -119,11 +119,11 @@ function Core_ClientServer::onDestroy( %this )
    
    sfxShutdown();
       
-   echo("Exporting client prefs");
    %prefPath = getPrefpath();
+   echo("Exporting client prefs to "@ getUserHomeDirectory() @ "/clientPrefs." @ $TorqueScriptFileExtension);
    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);
    BanList::Export(%prefPath @ "/banlist." @ $TorqueScriptFileExtension);
 }

+ 1 - 1
Templates/BaseGame/game/core/clientServer/scripts/server/server.tscript

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

+ 1 - 1
Templates/BaseGame/game/data/UI/guis/joinServerMenu.tscript

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

+ 5 - 3
Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript

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