From 3797038664d26df2100b88d12fe0f98bcc56b84e Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Thu, 30 Jan 2025 17:29:31 -0600
Subject: [PATCH] Don't report keybinds unless asked Do report where you're
 saving prefs

---
 .../game/core/clientServer/Core_ClientServer.tscript      | 4 ++--
 .../game/core/clientServer/scripts/server/server.tscript  | 2 +-
 .../BaseGame/game/data/UI/guis/joinServerMenu.tscript     | 2 +-
 Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript  | 8 +++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Templates/BaseGame/game/core/clientServer/Core_ClientServer.tscript b/Templates/BaseGame/game/core/clientServer/Core_ClientServer.tscript
index fa0e3a12f..cd09517c0 100644
--- a/Templates/BaseGame/game/core/clientServer/Core_ClientServer.tscript
+++ b/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);
 }
diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/server.tscript b/Templates/BaseGame/game/core/clientServer/scripts/server/server.tscript
index 8ef333f5c..243563a92 100644
--- a/Templates/BaseGame/game/core/clientServer/scripts/server/server.tscript
+++ b/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);
diff --git a/Templates/BaseGame/game/data/UI/guis/joinServerMenu.tscript b/Templates/BaseGame/game/data/UI/guis/joinServerMenu.tscript
index 24aad2152..02fd09c13 100644
--- a/Templates/BaseGame/game/data/UI/guis/joinServerMenu.tscript
+++ b/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);  
 }
 
diff --git a/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript b/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
index a9d1aae40..d37f3ebce 100644
--- a/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
+++ b/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() {