Selectable scopes via cvarsync

TNG-manual.txt

@@ -674,6 +674,15 @@ Features
   esp_leaderequip [0/1/2/3] - Adjusts the loadout of all leaders, see Espionage.md for details
   esp_enhancedslippers [0|1] (default: "0") to remove limping from leg damage (falling and shooting), and 50% damage reduction when falling long distances
 
+* cvarsync
+  For AQtion-enhanced clients (protocol 38), this allows the server to sync cvars with the client, as well as allowing the player to have 
+  normally server-enforced settings be clientside.
+
+  cl_zoom_scope [string] - Default is empty "".  Setting this value will load different sniper scopes, if they are available.  New scope directory
+  is `action/pics/scopes/YOURSCOPE`, where YOURSCOPE is the value of this cvar.  If you wish to use the default scope after setting this value, Set
+  cl_zoom_scope to "default" (without quotes).  Setting this to a string value that is not a valid scope will result in a big ugly red blob, so
+  test your scope selection before using it in a match.
+
 --------------------------------------------------------------------------------------------------------------------
 Contact Information
   If you wish to contact the TNG team, to report a bug, suggest a new feature, or offer JBravo your

change.txt

@@ -9,6 +9,7 @@ From 2.83
 + printrules: Value [0/1], default 0 (disabled).  If enabled, a printout of the rules will display once the countdown begins in Teamplay modes
 + timedmsgs: Value [0/1], default 0 (disabled).  If enabled, messages will be printed in the game, determined by state and time in the round
 + auto_join 2: Added an option for automatically joining a team using the JoinTeamAuto logic.  Automatically disabled for matchmode.
++ cl_zoom_scope: [string], Allows player to select different sniper zoom scope images.  Default is empty "" which is legacy behavior.
 
 From 2.82
 + mapvote_next_limit: Value in seconds, restricts players from voting for a map at the very end of the match while still enabling mapvote_next features

source/g_cmds.c

@@ -1695,13 +1695,23 @@ static void Cmd_PrintSettings_f( edict_t * ent )
 	itmflagsSettings( text, sizeof( text ), (int)itm_flags->value );
 
 	length = strlen( text );
+	#ifdef USE_AQTION
 	Com_sprintf( text + length, sizeof( text ) - length, "\n"
 		"timelimit   %2d roundlimit  %2d roundtimelimit %2d\n"
 		"limchasecam %2d tgren       %2d antilag_interp %2d\n"
 		"use_xerp    %2d llsound     %2d\n",
 		(int)timelimit->value, (int)roundlimit->value, (int)roundtimelimit->value,
 		(int)limchasecam->value, (int)tgren->value, (int)sv_antilag_interp->value,
 		(int)use_xerp->value, (int)llsound->value );
+	#else
+	Com_sprintf( text + length, sizeof( text ) - length, "\n"
+		"timelimit   %2d roundlimit  %2d roundtimelimit %2d\n"
+		"limchasecam %2d tgren       %2d antilag_interp %2d\n"
+		"use_xerp    %2d llsound     %2d\n",
+		(int)timelimit->value, (int)roundlimit->value, (int)roundtimelimit->value,
+		(int)limchasecam->value, (int)tgren->value, (int)sv_antilag_interp->value,
+		(int)llsound->value );
+	#endif
 
 	gi.cprintf( ent, PRINT_HIGH, text );
 }

source/g_ext.c

@@ -261,6 +261,22 @@ void G_CvarSync_Updated(int index, edict_t *clent)
 			client->pers.cl_indicators = val_i;
 			break;
 
+		case clcvar_cl_zoom_scope:
+			client->pers.cl_zoom_scope = val;
+			char filename[MAX_QPATH];
+			int i;
+
+			if (strlen(val) == 0) { // Default scope
+				break;
+			} else {
+				for (i = 1; i <= 3; i++) {
+					sprintf(filename, "scopes/%s/scope%dx", val, i * 2);
+					level.pic_sniper_mode[i] = gi.imageindex(filename);
+				}
+				break;
+			}
+			break;
+
 		case clcvar_cl_spectatorhud:
 			if (val_i)
 				client->pers.spec_flags |= (SPECFL_SPECHUD | SPECFL_SPECHUD_NEW);

source/g_local.h

@@ -1717,6 +1717,7 @@ typedef struct
 #ifdef AQTION_EXTENSION
 	int cl_xerp;
 	int cl_indicators;
+	int cl_zoom_scope;
 #endif
 
 	int mk23_mode;		// firing mode, semi or auto
@@ -2495,6 +2496,7 @@ typedef enum {
 	clcvar_cl_xerp,
 	clcvar_cl_spectatorhud,
 	clcvar_cl_spectatorkillfeed,
+	clcvar_cl_zoom_scope,
 } clcvar_t;
 
 // UI flags from q2pro

source/g_save.c

@@ -723,6 +723,7 @@ void InitGame( void )
 	CvarSync_Set(clcvar_cl_xerp, "cl_xerp", "0");
 	CvarSync_Set(clcvar_cl_spectatorhud, "cl_spectatorhud", "1");
 	CvarSync_Set(clcvar_cl_spectatorkillfeed, "cl_spectatorkillfeed", "0");
+	CvarSync_Set(clcvar_cl_zoom_scope, "cl_zoom_scope", "");
 #endif
 }