Migrate some more cl_* cvars

Tiny bug fix: cl_consoleFontSize was read as a float in one place but
the font size is always created with an integer value.

Author: slipher

src/engine/client/cl_avi.cpp

@@ -334,7 +334,7 @@ bool CL_OpenAVIForWriting( const char *fileName )
 	afd = {};
 
 	// Don't start if a framerate has not been chosen
-	if ( cl_aviFrameRate->integer <= 0 )
+	if ( cl_aviFrameRate.Get() <= 0 )
 	{
 		Log::Warn("cl_aviFrameRate must be ≥ 1" );
 		return false;
@@ -353,7 +353,7 @@ bool CL_OpenAVIForWriting( const char *fileName )
 
 	Q_strncpyz( afd.fileName, fileName, MAX_QPATH );
 
-	afd.frameRate = cl_aviFrameRate->integer;
+	afd.frameRate = cl_aviFrameRate.Get();
 	afd.framePeriod = ( int )( 1000000.0f / afd.frameRate );
 	afd.width = cls.windowConfig.vidWidth;
 	afd.height = cls.windowConfig.vidHeight;

src/engine/client/cl_input.cpp

@@ -827,19 +827,11 @@ bool CL_ReadyToSendPacket()
 	}
 
 	// check for exceeding cl_maxpackets
-	if ( cl_maxpackets->integer < 15 )
-	{
-		Cvar_Set( "cl_maxpackets", "15" );
-	}
-	else if ( cl_maxpackets->integer > 125 )
-	{
-		Cvar_Set( "cl_maxpackets", "125" );
-	}
 
 	oldPacketNum = ( clc.netchan.outgoingSequence - 1 ) & PACKET_MASK;
 	delta = cls.realtime - cl.outPackets[ oldPacketNum ].p_realtime;
 
-	if ( delta < 1000 / cl_maxpackets->integer )
+	if ( delta < 1000 / cl_maxpackets.Get() )
 	{
 		// the accumulated commands will go out in the next packet
 		return false;
@@ -916,16 +908,8 @@ void CL_WritePacket()
 	// we want to send all the usercmds that were generated in the last
 	// few packet, so even if a couple packets are dropped in a row,
 	// all the cmds will make it to the server
-	if ( cl_packetdup->integer < 0 )
-	{
-		Cvar_Set( "cl_packetdup", "0" );
-	}
-	else if ( cl_packetdup->integer > 5 )
-	{
-		Cvar_Set( "cl_packetdup", "5" );
-	}
 
-	oldPacketNum = ( clc.netchan.outgoingSequence - 1 - cl_packetdup->integer ) & PACKET_MASK;
+	oldPacketNum = ( clc.netchan.outgoingSequence - 1 - cl_packetdup.Get() ) & PACKET_MASK;
 	count = cl.cmdNumber - cl.outPackets[ oldPacketNum ].p_cmdNumber;
 
 	if ( count > MAX_PACKET_USERCMDS )

src/engine/client/cl_main.cpp

@@ -67,8 +67,8 @@ Cvar::Cvar<float> cl_mumbleScale("cl_mumbleScale", "multiplier of world coordina
 Cvar::Cvar<bool> cl_nodelta("cl_nodelta", "disable network snapshot delta compression", Cvar::NONE, false);
 
 Cvar::Cvar<float> cl_timeout("cl_timeout", "disconnect after this many seconds without server packets", Cvar::NONE, 200);
-cvar_t *cl_maxpackets;
-cvar_t *cl_packetdup;
+Cvar::Range<Cvar::Cvar<int>> cl_maxpackets("cl_maxpackets", "client->server max packets per second", Cvar::NONE, 125, 15, 125);
+Cvar::Range<Cvar::Cvar<int>> cl_packetdup("cl_packetdup", "send N extra copies of each usercmd_t", Cvar::NONE, 1, 0, 5);
 Cvar::Range<Cvar::Cvar<int>> cl_timeNudge("cl_timeNudge", "ms to extrapolate/interpolate ahead/behind latest snapshots (negative means extrapolate ahead)", Cvar::NONE, 0, -30, 30);
 cvar_t *cl_showTimeDelta;
 
@@ -89,7 +89,7 @@ Cvar::Cvar<std::string> cvar_demo_status_filename(
     ""
 );
 
-cvar_t *cl_aviFrameRate;
+Cvar::Cvar<int> cl_aviFrameRate("cl_aviFrameRate", "demo video framerate", Cvar::NONE, 25);
 
 Cvar::Cvar<bool> cl_freelook("cl_freelook", "vertical mouse movement always controls pitch", Cvar::NONE, true);
 
@@ -121,9 +121,9 @@ Cvar::Cvar<bool> cl_autorecord("cl_autorecord", "record a demo of every game", C
 Cvar::Cvar<bool> cl_allowDownload("cl_allowDownload", "auto-download paks required by the server", Cvar::NONE, true);
 
 Cvar::Cvar<std::string> cl_consoleFont("cl_consoleFont", "path (in homepath) for console typeface", Cvar::NONE, "");
-cvar_t                 *cl_consoleFontSize;
-cvar_t                 *cl_consoleFontScaling;
-cvar_t                 *cl_consoleFontKerning;
+Cvar::Cvar<int> cl_consoleFontSize("cl_consoleFontSize", "console font point size", Cvar::NONE, 16);
+Cvar::Cvar<bool> cl_consoleFontScaling("cl_consoleFontScaling", "rescale console font size by ratio of display size to 1080p", Cvar::NONE, true);
+Cvar::Cvar<float> cl_consoleFontKerning("cl_consoleFontKerning", "px of horizontal padding on console glyphs", Cvar::NONE, 0);
 //see also com_consoleCommand for terminal consoles
 Cvar::Cvar<std::string> cl_consoleCommand("cl_consoleCommand", "command prepended to console lines, when in game", Cvar::NONE, "say");
 
@@ -2098,20 +2098,20 @@ bool CL_InitRenderer()
 	}
 
 	Cvar::Latch(cl_consoleFont);
-	cl_consoleFontSize = Cvar_Get( "cl_consoleFontSize", "16",  CVAR_LATCH );
-	cl_consoleFontScaling = Cvar_Get( "cl_consoleFontScaling", "1", CVAR_LATCH );
+	Cvar::Latch(cl_consoleFontSize);
+	Cvar::Latch(cl_consoleFontScaling);
 
 	// Register console font specified by cl_consoleFont. Empty string means use the embbed Unifont
 
-	int fontSize = cl_consoleFontSize->integer;
+	int fontSize = cl_consoleFontSize.Get();
 
-	if ( cl_consoleFontScaling->integer )
+	if ( cl_consoleFontScaling.Get() )
 	{
 		// This gets 12px on 1920×1080 screen, which is libRocket default for 1em
 		int fontScale = std::min(cls.windowConfig.vidWidth, cls.windowConfig.vidHeight) / 90;
 
 		// fontScale / 12px gets 1px on 1920×1080 screen
-		fontSize = cl_consoleFontSize->integer * fontScale / 12;
+		fontSize = cl_consoleFontSize.Get() * fontScale / 12;
 	}
 
 	if ( !cl_consoleFont.Get().empty() )
@@ -2301,13 +2301,6 @@ void CL_Init()
 	cl_showSend = Cvar_Get( "cl_showSend", "0", CVAR_TEMP );
 	cl_showTimeDelta = Cvar_Get( "cl_showTimeDelta", "0", CVAR_TEMP );
 
-	cl_aviFrameRate = Cvar_Get( "cl_aviFrameRate", "25", 0 );
-
-	cl_maxpackets = Cvar_Get( "cl_maxpackets", "125", 0 );
-	cl_packetdup = Cvar_Get( "cl_packetdup", "1", 0 );
-
-	cl_consoleFontKerning = Cvar_Get( "cl_consoleFontKerning", "0", 0 );
-
 	// userinfo
 	cl_rate = Cvar_Get( "rate", XSTRING(NETWORK_DEFAULT_RATE), CVAR_USERINFO | CVAR_ARCHIVE);
 

src/engine/client/cl_scrn.cpp

@@ -282,7 +282,7 @@ void SCR_UpdateScreen()
 
 float SCR_ConsoleFontUnicharWidth( int ch )
 {
-	return Glyph( ch )->xSkip + cl_consoleFontKerning->value;
+	return Glyph( ch )->xSkip + cl_consoleFontKerning.Get();
 }
 
 float SCR_ConsoleFontCharWidth( const char *s )
@@ -292,7 +292,7 @@ float SCR_ConsoleFontCharWidth( const char *s )
 
 float SCR_ConsoleFontCharHeight()
 {
-	return cls.consoleFont->glyphBlock[0][(unsigned)'I'].imageHeight + CONSOLE_FONT_VPADDING * cl_consoleFontSize->value;
+	return cls.consoleFont->glyphBlock[0][(unsigned)'I'].imageHeight + CONSOLE_FONT_VPADDING * cl_consoleFontSize.Get();
 }
 
 float SCR_ConsoleFontCharVPadding()

src/engine/client/client.h

@@ -369,8 +369,8 @@ extern struct rsa_private_key private_key;
 // cvars
 //
 extern Cvar::Cvar<bool> cl_nodelta;
-extern cvar_t *cl_maxpackets;
-extern cvar_t *cl_packetdup;
+extern Cvar::Range<Cvar::Cvar<int>> cl_maxpackets;
+extern Cvar::Range<Cvar::Cvar<int>> cl_packetdup;
 extern cvar_t *cl_shownet;
 extern cvar_t *cl_showSend;
 extern Cvar::Range<Cvar::Cvar<int>> cl_timeNudge;
@@ -413,15 +413,15 @@ extern Cvar::Cvar<bool> cl_allowDownload;
 // -NERVE - SMF
 
 extern Cvar::Cvar<std::string> cl_consoleFont;
-extern cvar_t *cl_consoleFontSize;
-extern cvar_t *cl_consoleFontScaling;
-extern cvar_t *cl_consoleFontKerning;
+extern Cvar::Cvar<int> cl_consoleFontSize;
+extern Cvar::Cvar<bool> cl_consoleFontScaling;
+extern Cvar::Cvar<float> cl_consoleFontKerning;
 extern Cvar::Cvar<std::string> cl_consoleCommand;
 
 extern Cvar::Range<Cvar::Cvar<int>> con_scrollLock;
 
 // XreaL BEGIN
-extern cvar_t *cl_aviFrameRate;
+extern Cvar::Cvar<int> cl_aviFrameRate;
 extern Cvar::Cvar<bool> cl_aviMotionJpeg;
 // XreaL END