Ticket #1778: 0ad-adding-RecordLastMPServerAndPlayer.diff

source/gui/scripting/ScriptFunctions.cpp

@@ -185 +185 @@
     return server;
 }
 
+void SaveMPConfig(void* UNUSED(cbdata), std::wstring playerName, std::wstring server)
+{
+    g_ConfigDB.CreateValue(CFG_USER, "playername")->m_String = CStrW(playerName).ToUTF8();
+    g_ConfigDB.CreateValue(CFG_USER, "multiplayerserver")->m_String = CStrW(server).ToUTF8();
+    g_ConfigDB.WriteFile(CFG_USER);
+}
+
 void StartNetworkGame(void* UNUSED(cbdata))
 {
     ENSURE(g_NetServer);
@@ -641 +648 @@
     scriptInterface.RegisterFunction<int, &GetPlayerID>("GetPlayerID");
     scriptInterface.RegisterFunction<std::wstring, &GetDefaultPlayerName>("GetDefaultPlayerName");
     scriptInterface.RegisterFunction<std::wstring, &GetDefaultMPServer>("GetDefaultMPServer");
+    scriptInterface.RegisterFunction<void, std::wstring, std::wstring, &SaveMPConfig>("SaveMPConfig");
     scriptInterface.RegisterFunction<void, std::string, &OpenURL>("OpenURL");
     scriptInterface.RegisterFunction<void, &RestartInAtlas>("RestartInAtlas");
     scriptInterface.RegisterFunction<bool, &AtlasIsAvailable>("AtlasIsAvailable");

binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml

@@ -39 +39 @@
                 Server Hostname or IP:
             </object>
 
-            <object name="joinIP" type="input" size="210 80 100%-32 104" style="StoneInput">
+            <object name="joinServer" type="input" size="210 80 100%-32 104" style="StoneInput">
                 <action on="Load"><![CDATA[
                     this.caption = Engine.GetDefaultMPServer();
                 ]]></action>
@@ -48 +48 @@
             <object type="button" size="50%-144 100%-60 50%-16 100%-32" style="StoneButton">
                 Continue
                 <action on="Press"><![CDATA[
-                    if (startJoin(
-                        getGUIObjectByName("joinPlayerName").caption,
-                        getGUIObjectByName("joinIP").caption))
+                    var joinPlayerName = getGUIObjectByName("joinPlayerName").caption;
+                    var joinServer = getGUIObjectByName("joinServer").caption;
+                  Engine.SaveMPConfig(joinPlayerName, joinServer);
+                    if (startJoin(joinPlayerName, joinServer))
                     {
                         switchSetupPage("pageJoin", "pageConnecting");
                     }