TRACKER: r_tracker_colorfix colors both names in frag line (#896)

* TRACKER: r_tracker_colorfix colors entire fragline * TRACKER: add description for colorfix cvar --------- Co-authored-by: dustin <[email protected]>
QW-Group · Feb 25, 2024 · 7a08387 · 7a08387
1 parent 37b8530
commit 7a08387
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/help_variables.json b/help_variables.json
@@ -16720,6 +16720,12 @@
       "group-id": "40",
       "type": "string"
     },
+    "r_tracker_colorfix": {
+      "default": "0",
+      "desc": "Both players in fragline will be colored according to good/bad/myfrag/etc values.",
+      "group-id": "40",
+      "type": "integer"
+    },
     "r_tracker_flags": {
       "default": "0",
       "desc": "Everytime you take, capture or drop a flag, the number of times is displayed on the screen.",

diff --git a/src/vx_tracker.c b/src/vx_tracker.c
@@ -96,6 +96,7 @@ cvar_t amf_tracker_frags                           = {"r_tracker_frags", "1"};
 cvar_t amf_tracker_streaks                         = {"r_tracker_streaks", "0"};
 cvar_t amf_tracker_time                            = {"r_tracker_time", "4"};
 cvar_t amf_tracker_messages                        = {"r_tracker_messages", "20"};
+static cvar_t amf_tracker_colorfix				         = {"r_tracker_colorfix", "0"};
 static cvar_t amf_tracker_pickups                  = {"r_tracker_pickups", "0"};
 cvar_t amf_tracker_align_right                     = {"r_tracker_align_right", "1"};
 cvar_t amf_tracker_scale                           = {"r_tracker_scale", "1"};
@@ -189,6 +190,7 @@ void InitTracker(void)
 	Cvar_Register(&amf_tracker_flags);
 	Cvar_Register(&amf_tracker_streaks);
 	Cvar_Register(&amf_tracker_messages);
+	Cvar_Register(&amf_tracker_colorfix);
 	Cvar_Register(&amf_tracker_inconsole);
 	Cvar_Register(&amf_tracker_inconsole_colored_weapon);
 	Cvar_Register(&amf_tracker_time);
@@ -766,6 +768,7 @@ void VX_TrackerSuicide(int player, int weapon, int count)
 
 void VX_TrackerFragXvsY(int player, int killer, int weapon, int player_wcount, int killer_wcount)
 {
+	int colorfix = amf_tracker_colorfix.integer;
 	char outstring[20];
 	char player_name[MAX_SCOREBOARDNAME];
 	char killer_name[MAX_SCOREBOARDNAME];
@@ -783,7 +786,7 @@ void VX_TrackerFragXvsY(int player, int killer, int weapon, int player_wcount, i
 			Q_normalizetext(player_name);
 			Q_normalizetext(killer_name);
 
-			VX_TrackerAddWeaponImageSplit(killer_name, XvsYFullColor(player, killer), weapon, player_name, XvsYFullColor(killer, player));
+			VX_TrackerAddWeaponImageSplit(killer_name, XvsYFullColor(player, killer), weapon, player_name, colorfix ? XvsYFullColor(player, killer) : XvsYFullColor(killer, player));
 		}
 		else {
 			VX_TrackerAddWeaponTextSplit(killer_name, weapon, XvsYFullColor(player, killer), player_name);