Migrate cvar sv_running

We need to be careful with this one: I changed the type to bool, but the
string representation must still be "0"/"1" for gamelogic compat.

Author: slipher

src/engine/client/cl_cgame.cpp

@@ -694,7 +694,7 @@ void CL_AdjustTimeDelta()
 	// if the current time is WAY off, just correct to the current value
 
 	/*
-	        if(com_sv_running->integer)
+	        if(com_sv_running.Get())
 	        {
 	                resetTime = 100;
 	        }

src/engine/client/cl_main.cpp

@@ -689,7 +689,7 @@ void CL_ShutdownAll()
 	// Gordon: stop recording on map change etc, demos aren't valid over map changes anyway
 	CL_StopRecord();
 
-	if ( !com_sv_running->integer )
+	if ( !com_sv_running.Get() )
 	{
 		void SV_ShutdownGameProgs();
 		SV_ShutdownGameProgs();
@@ -1014,7 +1014,7 @@ void CL_Connect_f()
 	// clear any previous "server full" type messages
 	clc.serverMessage[ 0 ] = 0;
 
-	if ( com_sv_running->integer && !strcmp( server, "loopback" ) )
+	if ( com_sv_running.Get() && !strcmp( server, "loopback" ) )
 	{
 		// if running a local server, kill it
 		SV_Shutdown( "Server quit" );

src/engine/client/cl_parse.cpp

@@ -352,7 +352,7 @@ void CL_SystemInfoChanged()
 	cl.serverId = atoi( Info_ValueForKey( systemInfo, "sv_serverid" ) );
 
 	// load paks sent by the server, but not if we are running a local server
-	if (!com_sv_running->integer) {
+	if (!com_sv_running.Get()) {
 		FS::PakPath::ClearPaks();
 		if (!FS_LoadServerPaks(Info_ValueForKey(systemInfo, "sv_paks"), clc.demoplaying)) {
 			if (!cl_allowDownload->integer) {

src/engine/client/cl_scrn.cpp

@@ -255,7 +255,7 @@ void SCR_DrawScreenField()
 
 				// also draw the connection information, so it doesn't
 				// flash away too briefly on local or LAN games
-				//if (!com_sv_running->value || Cvar_VariableIntegerValue("sv_cheats")) // Ridah, don't draw useless text if not in dev mode
+				//if (!com_sv_running.Get() || Cvar_VariableIntegerValue("sv_cheats")) // Ridah, don't draw useless text if not in dev mode
 				break;
 
 			case connstate_t::CA_ACTIVE:

src/engine/qcommon/common.cpp

@@ -61,7 +61,7 @@ Cvar::Cvar<bool> cvar_demo_timedemo(
     Cvar::CHEAT | Cvar::TEMPORARY,
     false
 );
-cvar_t *com_sv_running;
+Cvar::Cvar<bool> com_sv_running("sv_running", "do we have a server running?", Cvar::ROM, false);
 cvar_t *com_cl_running;
 cvar_t *com_version;
 
@@ -183,7 +183,7 @@ bool Com_IsDedicatedServer()
 
 bool Com_ServerRunning()
 {
-	return com_sv_running->integer;
+	return com_sv_running.Get();
 }
 
 /*
@@ -384,7 +384,7 @@ static void HandlePacketEvent(const Sys::PacketEvent& event)
 	buf.cursize = event.data.size();
 	memcpy( buf.data, event.data.data(), buf.cursize );
 
-	if ( com_sv_running->integer )
+	if ( com_sv_running.Get() )
 	{
 		Com_RunAndTimeServerPacket( &event.adr, &buf );
 	}
@@ -432,7 +432,7 @@ void Com_EventLoop()
 			while ( NET_GetLoopPacket( netsrc_t::NS_SERVER, &evFrom, &buf ) )
 			{
 				// if the server just shut down, flush the events
-				if ( com_sv_running->integer )
+				if ( com_sv_running.Get() )
 				{
 					Com_RunAndTimeServerPacket( &evFrom, &buf );
 				}
@@ -560,7 +560,6 @@ void Com_Init()
 	com_dropsim = Cvar_Get( "com_dropsim", "0", CVAR_CHEAT );
 	com_speeds = Cvar_Get( "com_speeds", "0", 0 );
 
-	com_sv_running = Cvar_Get( "sv_running", "0", CVAR_ROM );
 	com_cl_running = Cvar_Get( "cl_running", "0", CVAR_ROM );
 
 	com_unfocused = Cvar_Get( "com_unfocused", "0", CVAR_ROM );

src/engine/qcommon/net_ip.cpp

@@ -1882,6 +1882,6 @@ void NET_Restart_f()
 #ifdef BUILD_SERVER
 	NET_EnableNetworking( true );
 #else
-	NET_EnableNetworking( !!com_sv_running->integer );
+	NET_EnableNetworking( com_sv_running.Get() );
 #endif
 }

src/engine/qcommon/qcommon.h

@@ -530,7 +530,7 @@ bool       Com_ServerRunning();
 
 extern cvar_t       *com_speeds;
 extern cvar_t       *com_timescale;
-extern cvar_t       *com_sv_running;
+extern Cvar::Cvar<bool> com_sv_running;
 extern cvar_t       *com_cl_running;
 extern cvar_t       *com_version;
 

src/engine/server/sv_ccmds.cpp

@@ -153,7 +153,7 @@ static void SV_MapRestart_f()
 	}
 
 	// make sure server is running
-	if ( !com_sv_running->integer )
+	if ( !com_sv_running.Get() )
 	{
 		Log::Notice( "Server is not running." );
 		return;
@@ -245,7 +245,7 @@ class StatusCmd: public Cmd::StaticCmd
 	void Run(const Cmd::Args&) const override
 	{
 		// make sure server is running
-		if ( !com_sv_running->integer )
+		if ( !com_sv_running.Get() )
 		{
 			Log::Notice( "Server is not running." );
 			return;
@@ -352,7 +352,7 @@ Examine the serverinfo string
 static void SV_Serverinfo_f()
 {
 	// make sure server is running
-	if ( !com_sv_running->integer )
+	if ( !com_sv_running.Get() )
 	{
 		Log::Notice( "Server is not running." );
 		return;
@@ -372,7 +372,7 @@ Examine the systeminfo string
 static void SV_Systeminfo_f()
 {
 	// make sure server is running
-	if ( !com_sv_running->integer )
+	if ( !com_sv_running.Get() )
 	{
 		Log::Notice( "Server is not running." );
 		return;
@@ -413,7 +413,7 @@ SV_AddOperatorCommands
 */
 void SV_AddOperatorCommands()
 {
-	if ( com_sv_running->integer )
+	if ( com_sv_running.Get() )
 	{
 		// These commands should only be available while the server is running.
 		Cmd_AddCommand( "fieldinfo",   SV_FieldInfo_f );

src/engine/server/sv_init.cpp

@@ -320,7 +320,7 @@ void SV_Startup()
 
 	svs.initialized = true;
 
-	Cvar_Set( "sv_running", "1" );
+	Cvar::SetValueForce( "sv_running", "1" );
 #ifndef BUILD_SERVER
 	// For clients, reconfigure to open server ports.
 	NET_EnableNetworking( true );
@@ -665,7 +665,7 @@ void SV_FinalCommand( char *cmd, bool disconnect )
 // Used instead of SV_Shutdown when Daemon is exiting
 void SV_QuickShutdown( const char *finalmsg )
 {
-	if ( !com_sv_running || !com_sv_running->integer )
+	if ( !com_sv_running.Get() )
 	{
 		return;
 	}
@@ -690,7 +690,7 @@ Called to shut down the sgame VM, or to clean up after the VM shut down on its o
 */
 void SV_Shutdown( const char *finalmsg )
 {
-	if ( !com_sv_running || !com_sv_running->integer )
+	if ( !com_sv_running.Get() )
 	{
 		return;
 	}
@@ -725,7 +725,7 @@ void SV_Shutdown( const char *finalmsg )
 	svs.serverLoad = -1;
 	ChallengeManager::Clear();
 
-	Cvar_Set( "sv_running", "0" );
+	Cvar::SetValueForce( "sv_running", "0" );
 #ifndef BUILD_SERVER
 	// For clients, reconfigure to close server ports.
 	NET_EnableNetworking( false );

src/engine/server/sv_main.cpp

@@ -513,7 +513,7 @@ if a user is interested in a server to do a full status
 */
 static void SVC_Info( const netadr_t& from, const Cmd::Args& args )
 {
-	if ( SV_Private(ServerPrivate::NoStatus) || !com_sv_running || !com_sv_running->integer )
+	if ( SV_Private(ServerPrivate::NoStatus) || !com_sv_running.Get() )
 	{
 		return;
 	}
@@ -1325,7 +1325,7 @@ void SV_Frame( int msec )
 		return;
 	}
 
-	if ( !com_sv_running->integer )
+	if ( !com_sv_running.Get() )
 	{
 		return;
 	}