Migrate cvars sv_fullmsg, sv_fps

Author: slipher

src/engine/server/server.h

@@ -290,7 +290,7 @@ extern serverStatic_t svs; // persistent server info across maps
 extern server_t       sv; // cleared each map
 extern GameVM         gvm; // game virtual machine
 
-extern cvar_t         *sv_fps;
+extern Cvar::Range<Cvar::Cvar<int>> sv_fps;
 extern Cvar::Cvar<int> sv_timeout;
 extern Cvar::Cvar<int> sv_zombietime;
 extern Cvar::Cvar<std::string> sv_privatePassword;
@@ -314,7 +314,7 @@ extern Cvar::Cvar<bool> sv_lanForceRate;
 extern Cvar::Cvar<int> sv_dl_maxRate;
 
 //fretn
-extern cvar_t *sv_fullmsg;
+extern Cvar::Cvar<std::string> sv_fullmsg;
 
 extern Cvar::Range<Cvar::Cvar<int>> sv_networkScope;
 

src/engine/server/sv_client.cpp

@@ -175,7 +175,7 @@ void SV_DirectConnect( const netadr_t& from, const Cmd::Args& args )
 			}
 			else
 			{
-				Net::OutOfBandPrint( netsrc_t::NS_SERVER, from, "print\n%s", sv_fullmsg->string );
+				Net::OutOfBandPrint( netsrc_t::NS_SERVER, from, "print\n%s", sv_fullmsg.Get() );
 				Log::Debug( "Rejected a connection." );
 				return;
 			}
@@ -1055,9 +1055,9 @@ void SV_UserinfoChanged( client_t *cl )
 		{
 			i = 1;
 		}
-		else if ( i > sv_fps->integer )
+		else if ( i > sv_fps.Get() )
 		{
-			i = sv_fps->integer;
+			i = sv_fps.Get();
 		}
 
 		cl->snapshotMsec = 1000 / i;

src/engine/server/sv_init.cpp

@@ -614,14 +614,9 @@ void SV_Init()
 	sv_serverid = Cvar_Get( "sv_serverid", "0", CVAR_SYSTEMINFO | CVAR_ROM );
 
 	// server vars
-	sv_fps = Cvar_Get( "sv_fps", "40", CVAR_TEMP );
 
 	sv_killserver = Cvar_Get( "sv_killserver", "0", 0 );
 
-	// fretn - note: redirecting of clients to other servers relies on this,
-	// ET://someserver.com
-	sv_fullmsg = Cvar_Get( "sv_fullmsg", "Server is full.", 0 );
-
 	svs.serverLoad = -1;
 }
 

src/engine/server/sv_main.cpp

@@ -56,7 +56,7 @@ GameVM         gvm; // game virtual machine
 // timescale 5, the number of gamelogic frames per wall second will be 200.
 // For the dedicated server this also controls the engine frame rate. The engine framerate
 // is based on real time, disregarding timescale.
-cvar_t         *sv_fps;
+Cvar::Range<Cvar::Cvar<int>> sv_fps("sv_fps", "sgame and dedicated server frame rate", Cvar::NONE, 40, 1, 1000);
 
 Cvar::Cvar<int> sv_timeout("sv_timeout", "seconds without connectivity after which to drop a client", Cvar::NONE, 240);
 Cvar::Cvar<int> sv_zombietime("sv_zombietime", "seconds without messages after which to recycle client slot", Cvar::NONE, 2);
@@ -81,7 +81,7 @@ Cvar::Cvar<bool> sv_lanForceRate("sv_lanForceRate", "make LAN clients use max ne
 Cvar::Cvar<int> sv_dl_maxRate("sv_dl_maxRate", "max bytes/sec for UDP pak download", Cvar::NONE, 42000);
 
 // fretn
-cvar_t *sv_fullmsg;
+Cvar::Cvar<std::string> sv_fullmsg("sv_fullmsg", "message for clients attempting to join full server", Cvar::NONE, "Server is full.");
 
 Cvar::Range<Cvar::Cvar<int>> sv_networkScope(
 	"sv_networkScope",
@@ -1285,23 +1285,16 @@ Return time in milliseconds until processing of the next server frame.
 */
 int SV_FrameMsec()
 {
-	if( sv_fps )
-	{
-		const int frameMsec = static_cast<int>(1000.0f / sv_fps->value);
-		int scaledResidual = static_cast<int>( sv.timeResidual / com_timescale->value );
+	const int frameMsec = 1000 / sv_fps.Get();
+	int scaledResidual = static_cast<int>( sv.timeResidual / com_timescale->value );
 
-		if ( frameMsec < scaledResidual )
-		{
-			return 0;
-		}
-		else
-		{
-			return frameMsec - scaledResidual;
-		}
+	if ( frameMsec < scaledResidual )
+	{
+		return 0;
 	}
 	else
 	{
-		return 1;
+		return frameMsec - scaledResidual;
 	}
 }
 
@@ -1340,12 +1333,7 @@ void SV_Frame( int msec )
 	frameStartTime = Sys::Milliseconds();
 
 	// if it isn't time for the next frame, do nothing
-	if ( sv_fps->integer < 1 )
-	{
-		Cvar_Set( "sv_fps", "10" );
-	}
-
-	frameMsec = 1000 / sv_fps->integer;
+	frameMsec = 1000 / sv_fps.Get();
 
 	sv.timeResidual += msec;