Attempt to implement master server list from daemon.conf

Author: illwieckz

src/engine/framework/CvarSystem.cpp

@@ -324,6 +324,24 @@ namespace Cvar {
         return result;
     }
 
+    void SetDefaultValue(const std::string &cvarName, const std::string& defaultValue) {
+        CvarMap& cvars = GetCvarMap();
+        auto it = cvars.find(cvarName);
+        cvarRecord_t *cvar = it->second;
+        GetCCvar(cvarName, *cvar);
+
+        /* HACK: Rewrite me when this issue is fixed:
+        https://github.com/DaemonEngine/Daemon/issues/590
+        Until that the cvar->ccvar.modified value can't be trusted. */
+
+        cvar->resetValue = defaultValue;
+        cvar->ccvar.resetString = CopyString(defaultValue.c_str());
+
+        if (!Q_stricmp(cvar->value.c_str(), "")) {
+            SetValue(cvarName, defaultValue);
+        }
+    }
+
     bool Register(CvarProxy* proxy, const std::string& name, std::string description, int flags, const std::string& defaultValue) {
         CvarMap& cvars = GetCvarMap();
         cvarRecord_t* cvar;

src/engine/framework/CvarSystem.h

@@ -75,6 +75,9 @@ namespace Cvar {
     bool AddFlags(const std::string& cvarName, int flags);
     bool ClearFlags(const std::string& cvarName, int flags);
 
+    // Change default value.
+    void SetDefaultValue(const std::string &cvarName, const std::string& defaultValue);
+
     // Used by statically defined cvar.
     bool Register(CvarProxy* proxy, const std::string& name, std::string description, int flags, const std::string& defaultValue);
     void Unregister(const std::string& cvarName);

src/engine/qcommon/gameinfo.cpp

@@ -26,9 +26,9 @@ along with Daemon Source Code.  If not, see <http://www.gnu.org/licenses/>.
 #include <string>
 
 #include "gameinfo.h"
+#include "framework/CvarSystem.h"
 #include "common/FileSystem.h"
 
-
 Gameinfo& Gameinfo::getInstance()
 {
 	static Gameinfo instance;
@@ -145,28 +145,33 @@ void Gameinfo::parse(std::string fname)
 		else if(argvec[i] == "MASTERSERVER1")
 		{
 			_masterserver1 = argvec[i+1];
+			Cvar::SetDefaultValue("sv_master1", _masterserver1);
 		}
 		/* Fully qualified domain name of the secondary master server.
 
 		Example: “master2.unvanquished.net” */
 		else if(argvec[i] == "MASTERSERVER2")
 		{
 			_masterserver2 = argvec[i+1];
+			Cvar::SetDefaultValue("sv_master2", _masterserver2);
 		}
 		/* Fully qualified domain name of the third master server. */
 		else if(argvec[i] == "MASTERSERVER3")
 		{
 			_masterserver3 = argvec[i+1];
+			Cvar::SetDefaultValue("sv_master3", _masterserver3);
 		}
 		/* Fully qualified domain name of the fourth master server. */
 		else if(argvec[i] == "MASTERSERVER4")
 		{
 			_masterserver4 = argvec[i+1];
+			Cvar::SetDefaultValue("sv_master4", _masterserver4);
 		}
 		/* Fully qualified domain name of the fifth master server. */
 		else if(argvec[i] == "MASTERSERVER5")
 		{
 			_masterserver5 = argvec[i+1];
+			Cvar::SetDefaultValue("sv_master5", _masterserver5);
 		}
 		/* URL to download missing packages when joining a server.
 

src/engine/server/sv_main.cpp

@@ -280,25 +280,12 @@ struct MasterServer
 	{}
 };
 
-// FIXME: still unvanquished specific
-/*
-	sv_master[ 0 ] = Cvar_Get( "sv_master1", Gameinfo::getInstance().masterserver1().c_str(), 0 );
-	sv_master[ 1 ] = Cvar_Get( "sv_master2", Gameinfo::getInstance().masterserver2().c_str(), 0 );
-	sv_master[ 2 ] = Cvar_Get( "sv_master3", Gameinfo::getInstance().masterserver3().c_str(), 0 );
-	sv_master[ 3 ] = Cvar_Get( "sv_master4", Gameinfo::getInstance().masterserver4().c_str(), 0 );
-	sv_master[ 4 ] = Cvar_Get( "sv_master5", Gameinfo::getInstance().masterserver5().c_str(), 0 );
-*/
-#define MASTER1_SERVER_NAME "master.unvanquished.net"
-#define MASTER2_SERVER_NAME "master2.unvanquished.net"
-#define MASTER3_SERVER_NAME ""
-#define MASTER4_SERVER_NAME ""
-#define MASTER5_SERVER_NAME ""
 MasterServer masterServers[MAX_MASTER_SERVERS] = {
-	{"sv_master1", MASTER1_SERVER_NAME},
-	{"sv_master2", MASTER2_SERVER_NAME},
-	{"sv_master3", MASTER3_SERVER_NAME},
-	{"sv_master4", MASTER4_SERVER_NAME},
-	{"sv_master5", MASTER5_SERVER_NAME},
+	{"sv_master1", ""},
+	{"sv_master2", ""},
+	{"sv_master3", ""},
+	{"sv_master4", ""},
+	{"sv_master5", ""},
 };
 } // namespace