Index: binaries/data/mods/public/gui/common/functions_utility.js
===================================================================
--- binaries/data/mods/public/gui/common/functions_utility.js
+++ binaries/data/mods/public/gui/common/functions_utility.js
@@ -8,6 +8,15 @@
};
/**
+ * Write setting with its value in the user config file.
+ */
+function writeSettingToUserConfig(setting, value)
+{
+ Engine.ConfigDB_CreateValue("user", setting, value);
+ Engine.ConfigDB_WriteValueToFile("user", setting, value, "config/user.cfg");
+}
+
+/**
* Returns translated history and gameplay data of all civs, optionally including a mock gaia civ.
*/
function loadCivData(selectableOnly, gaia)
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -1015,10 +1015,7 @@
// Replace empty playername when entering a singleplayermatch for the first time
if (!g_IsNetworked)
- {
- Engine.ConfigDB_CreateValue("user", "playername.singleplayer", singleplayerName());
- Engine.ConfigDB_WriteValueToFile("user", "playername.singleplayer", singleplayerName(), "config/user.cfg");
- }
+ writeSettingToUserConfig("playername.singleplayer", singleplayerName());
initDefaults();
supplementDefaults();
@@ -1212,13 +1209,6 @@
Engine.GetGUIObjectByName("aiTips").caption = Engine.TranslateLines(Engine.ReadFile("gui/gamesetup/ai.txt"));
}
-function saveSPTipsSetting()
-{
- let enabled = String(Engine.GetGUIObjectByName("displaySPTips").checked);
- Engine.ConfigDB_CreateValue("user", "gui.gamesetup.enabletips", enabled);
- Engine.ConfigDB_WriteValueToFile("user", "gui.gamesetup.enabletips", enabled, "config/user.cfg");
-}
-
function verticallyDistributeGUIObjects(parent, objectHeight, ignore)
{
let yPos;
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -132,7 +132,7 @@
Show this message in the future
Index: binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js
+++ binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js
@@ -272,23 +272,13 @@
Engine.GetGUIObjectByName("continueButton").hidden = newPage == "pageConnecting";
}
-function saveSTUNSetting(enabled)
-{
- Engine.ConfigDB_CreateValue("user", "lobby.stun.enabled", enabled);
- Engine.ConfigDB_WriteValueToFile("user", "lobby.stun.enabled", enabled, "config/user.cfg");
-}
-
function startHost(playername, servername, port)
{
startConnectionStatus("server");
- // Save player name
- Engine.ConfigDB_CreateValue("user", "playername.multiplayer", playername);
- Engine.ConfigDB_WriteValueToFile("user", "playername.multiplayer", playername, "config/user.cfg");
-
- // Save port
- Engine.ConfigDB_CreateValue("user", "multiplayerhosting.port", port);
- Engine.ConfigDB_WriteValueToFile("user", "multiplayerhosting.port", port, "config/user.cfg");
+ writeSettingToUserConfig("playername.multiplayer", playername);
+
+ writeSettingToUserConfig("multiplayerhosting.port", port);
let hostFeedback = Engine.GetGUIObjectByName("hostFeedback");
@@ -366,12 +356,9 @@
else
{
// Only save the player name and host address if they're valid and we're not in the lobby
- Engine.ConfigDB_CreateValue("user", "playername.multiplayer", playername);
- Engine.ConfigDB_WriteValueToFile("user", "playername.multiplayer", playername, "config/user.cfg");
- Engine.ConfigDB_CreateValue("user", "multiplayerserver", ip);
- Engine.ConfigDB_WriteValueToFile("user", "multiplayerserver", ip, "config/user.cfg");
- Engine.ConfigDB_CreateValue("user", "multiplayerjoining.port", port);
- Engine.ConfigDB_WriteValueToFile("user", "multiplayerjoining.port", port, "config/user.cfg");
+ writeSettingToUserConfig("playername.multiplayer", playername);
+ writeSettingToUserConfig("multiplayerserver", ip);
+ writeSettingToUserConfig("multiplayerjoining.port", port);
}
return true;
}
Index: binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
+++ binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
@@ -108,7 +108,7 @@