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

source/ps/GameSetup/Config.cpp

@@ -35 +35 @@
 
 bool g_PauseOnFocusLoss = false;
 CStr g_PlayerName = "";
+CStr g_MPServer = "";
 
 bool g_Shadows = false;
 bool g_ShadowPCF = false;
@@ -86 +87 @@
     CFG_GET_USER_VAL("novbo", Bool, g_NoGLVBO);
     CFG_GET_USER_VAL("pauseonfocusloss", Bool, g_PauseOnFocusLoss);
     CFG_GET_USER_VAL("playername", String, g_PlayerName);
+    CFG_GET_USER_VAL("multiplayerserver", String, g_MPServer);
     CFG_GET_USER_VAL("shadows", Bool, g_Shadows);
     CFG_GET_USER_VAL("shadowpcf", Bool, g_ShadowPCF);
     

source/ps/GameSetup/Config.h

@@ -47 +47 @@
 // default player name to use in multiplayer
 extern CStr g_PlayerName;
 
+// default server name or IP to use in multiplayer
+extern CStr g_MPServer;
+
 // flag to switch on shadows
 extern bool g_Shadows;
 

source/gui/scripting/ScriptFunctions.cpp

@@ -179 +179 @@
     return name;
 }
 
+std::wstring GetDefaultMPServer(void* UNUSED(cbdata))
+{
+    std::wstring server = g_MPServer.FromUTF8();
+    if (server.empty())
+        server = L"127.0.0.1";
+    return server;
+}
+
 void StartNetworkGame(void* UNUSED(cbdata))
 {
     ENSURE(g_NetServer);
@@ -634 +642 @@
     scriptInterface.RegisterFunction<std::wstring, std::wstring, &SetCursor>("SetCursor");
     scriptInterface.RegisterFunction<int, &GetPlayerID>("GetPlayerID");
     scriptInterface.RegisterFunction<std::wstring, &GetDefaultPlayerName>("GetDefaultPlayerName");
+    scriptInterface.RegisterFunction<std::wstring, &GetDefaultMPServer>("GetDefaultMPServer");
     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

@@ -40 +40 @@
             </object>
 
             <object name="joinIP" type="input" size="210 80 100%-32 104" style="StoneInput">
-                127.0.0.1
+                <action on="Load"><![CDATA[
+                    this.caption = Engine.GetDefaultMPServer();
+                ]]></action>
             </object>3 100%-33 103 100%-3
 
             <object type="button" size="50%-144 100%-60 50%-16 100%-32" style="StoneButton">