Migrate ROM cvars sv_serverid, mapname

Author: slipher

src/engine/server/server.h

@@ -303,9 +303,9 @@ extern Cvar::Cvar<std::string> sv_statsURL;
 extern Cvar::Cvar<int> sv_reconnectlimit;
 extern Cvar::Cvar<int> sv_padPackets;
 extern cvar_t         *sv_killserver;
-extern cvar_t         *sv_mapname;
+extern Cvar::Cvar<std::string> sv_mapname;
 extern cvar_t         *sv_mapChecksum;
-extern cvar_t         *sv_serverid;
+extern Cvar::Cvar<int> sv_serverid;
 extern Cvar::Cvar<int> sv_maxRate;
 
 extern Cvar::Cvar<bool> sv_lanForceRate;

src/engine/server/sv_ccmds.cpp

@@ -172,7 +172,7 @@ static void SV_MapRestart_f()
 	// generate a new serverid
 	// TTimo - don't update restartedserverId there, otherwise we won't deal correctly with multiple map_restart
 	sv.serverId = com_frameTime;
-	Cvar_Set( "sv_serverid", va( "%i", sv.serverId ) );
+	Cvar::SetValueForce( "sv_serverid", va( "%i", sv.serverId ) );
 
 	// reset all the VM data in place without changing memory allocation
 	// note that we do NOT set sv.state = SS_LOADING, so configstrings that
@@ -297,7 +297,7 @@ class StatusCmd: public Cmd::StaticCmd
 			PROTOCOL_VERSION,
 			cpu,
 			time_string,
-			sv_mapname->string,
+			sv_mapname.Get(),
 			players,
 			sv_maxClients.Get()
 		);

src/engine/server/sv_init.cpp

@@ -487,13 +487,13 @@ void SV_SpawnServer(std::string pakname, std::string mapname)
 	CM_LoadMap(mapname);
 
 	// set serverinfo visible name
-	Cvar_Set( "mapname", mapname.c_str() );
+	Cvar::SetValueForce( "mapname", mapname );
 	Cvar::SetValueForce( cvar_pakname.Name(), pakname );
 
 	// serverid should be different each time
 	sv.serverId = com_frameTime;
 	sv.restartedServerId = sv.serverId;
-	Cvar_Set( "sv_serverid", va( "%i", sv.serverId ) );
+	Cvar::SetValueForce( "sv_serverid", va( "%i", sv.serverId ) );
 
 	// media configstring setting should be done during
 	// the loading stage, so connected clients don't have
@@ -605,14 +605,10 @@ void SV_Init()
 	SV_AddOperatorCommands();
 
 	// serverinfo vars
-	sv_mapname = Cvar_Get( "mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM );
 	Cvar::Latch( sv_maxClients );
 	Cvar::SetValue( "layout", "" ); // TODO: declare in sgame
 	Cvar::AddFlags( "layout", Cvar::SERVERINFO );
 
-	// systeminfo
-	sv_serverid = Cvar_Get( "sv_serverid", "0", CVAR_SYSTEMINFO | CVAR_ROM );
-
 	// server vars
 
 	sv_killserver = Cvar_Get( "sv_killserver", "0", 0 );

src/engine/server/sv_main.cpp

@@ -72,8 +72,8 @@ Cvar::Cvar<std::string> sv_statsURL("sv_statsURL", "URL for server's gameplay st
 Cvar::Cvar<int> sv_reconnectlimit("sv_reconnectlimit", "minimum time (seconds) before client can reconnect", Cvar::NONE, 3);
 Cvar::Cvar<int> sv_padPackets("sv_padPackets", "(debugging) add n NOP bytes to each snapshot packet", Cvar::NONE, 0);
 cvar_t         *sv_killserver; // menu system can set to 1 to shut server down
-cvar_t         *sv_mapname;
-cvar_t         *sv_serverid;
+Cvar::Cvar<std::string> sv_mapname("mapname", "current map on this server", Cvar::SERVERINFO | Cvar::ROM, "nomap");
+Cvar::Cvar<int> sv_serverid("sv_serverid", "match ID", Cvar::SYSTEMINFO | Cvar::ROM, 0);
 Cvar::Cvar<int> sv_maxRate("sv_maxRate", "max bytes/sec to send to a client (0 = unlimited)", Cvar::SERVERINFO, 0);
 
 Cvar::Cvar<bool> sv_lanForceRate("sv_lanForceRate", "make LAN clients use max network rate", Cvar::NONE, true);
@@ -583,7 +583,7 @@ static void SVC_Info( const netadr_t& from, const Cmd::Args& args )
 	info_map["protocol"] = std::to_string( PROTOCOL_VERSION );
 	info_map["hostname"] = sv_hostname.Get();
 	info_map["serverload"] = std::to_string( svs.serverLoad );
-	info_map["mapname"] = sv_mapname->string;
+	info_map["mapname"] = sv_mapname.Get();
 	info_map["clients"] = std::to_string( publicSlotHumans + privateSlotHumans );
 	info_map["bots"] = std::to_string( bots );
 	// Satisfies (number of open public slots) = (displayed max clients) - (number of clients).
@@ -1357,7 +1357,7 @@ void SV_Frame( int msec )
 		// there won't be a map_restart if you have shut down the server
 		// since it doesn't restart a non-running server
 		// instead, re-run the current map
-		Cmd::BufferCommandText(Str::Format("map %s", Cmd::Escape(sv_mapname->string)));
+		Cmd::BufferCommandText(Str::Format("map %s", Cmd::Escape(sv_mapname.Get())));
 
 		Sys::Drop( "Restarting server due to time wrapping" );
 	}
@@ -1366,7 +1366,7 @@ void SV_Frame( int msec )
 	if ( svs.nextSnapshotEntities >= 0x7FFFFFFE - svs.numSnapshotEntities )
 	{
 		// TTimo see above
-		Cmd::BufferCommandText(Str::Format("map %s", Cmd::Escape(sv_mapname->string)));
+		Cmd::BufferCommandText(Str::Format("map %s", Cmd::Escape(sv_mapname.Get())));
 		Sys::Drop( "Restarting server due to numSnapshotEntities wrapping" );
 	}