Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Renamed scr_scoreboard_Xcolor that I added

Renamed scr_scoreboard_frag/death/tkcolor to:
scr_scoreboard_kill_color, scr_scoreboard_death_color,
scr_scoreboard_tk_color. Makes more sense I think.
  • Loading branch information...
commit 6659f50dca8ed8937321e2b7edfd81ec9c6a103f 1 parent 560776d
authored December 02, 2011

Showing 1 changed file with 12 additions and 12 deletions. Show diff stats Hide diff stats

  1. 24  sbar.c
24  sbar.c
@@ -109,9 +109,9 @@ cvar_t	scr_scoreboard_showfrags = {"scr_scoreboard_showfrags", "1"};
109 109
 cvar_t	scr_scoreboard_drawtitle = {"scr_scoreboard_drawtitle", "1"};
110 110
 cvar_t	scr_scoreboard_borderless = {"scr_scoreboard_borderless", "1"};
111 111
 
112  
-cvar_t	scr_scoreboard_fragcolor = {"scr_scoreboard_fragcolor", "0B4"};
113  
-cvar_t	scr_scoreboard_deathcolor = {"scr_scoreboard_deathcolor", "F00"};
114  
-cvar_t	scr_scoreboard_tkcolor = {"scr_scoreboard_tkcolor", "FF0"};
  112
+cvar_t	scr_scoreboard_kill_color = {"scr_scoreboard_kill_color", "0B4"};
  113
+cvar_t	scr_scoreboard_death_color = {"scr_scoreboard_death_color", "F00"};
  114
+cvar_t	scr_scoreboard_tk_color = {"scr_scoreboard_tk_color", "FF0"};
115 115
 
116 116
 #ifdef GLQUAKE
117 117
 cvar_t	scr_scoreboard_fillalpha = {"scr_scoreboard_fillalpha", "0.7"};
@@ -276,9 +276,9 @@ void Sbar_Init (void) {
276 276
 	Cvar_Register (&scr_scoreboard_showfrags);
277 277
 	Cvar_Register (&scr_scoreboard_drawtitle);
278 278
 	Cvar_Register (&scr_scoreboard_borderless);
279  
-	Cvar_Register (&scr_scoreboard_fragcolor);
280  
-	Cvar_Register (&scr_scoreboard_deathcolor);
281  
-	Cvar_Register (&scr_scoreboard_tkcolor);
  279
+	Cvar_Register (&scr_scoreboard_kill_color);
  280
+	Cvar_Register (&scr_scoreboard_death_color);
  281
+	Cvar_Register (&scr_scoreboard_tk_color);
282 282
 #ifdef GLQUAKE
283 283
 	Cvar_Register (&scr_scoreboard_fillalpha);
284 284
 	Cvar_Register (&scr_scoreboard_fillcolored);
@@ -1101,7 +1101,7 @@ static void Sbar_DeathmatchOverlay (int start) {
1101 1101
 	char num[12], scorerow[64], team[5], name[MAX_SCOREBOARDNAME];
1102 1102
 	char myminutes[4], fragsstr[10];
1103 1103
 	char *color;
1104  
-	char *fragcolor, *deathcolor, *tkcolor;
  1104
+	char *kill_color, *death_color, *tk_color;
1105 1105
 	int             scr_scoreboard_drawfps;
1106 1106
     int             offset;
1107 1107
     player_info_t *s;
@@ -1410,14 +1410,14 @@ static void Sbar_DeathmatchOverlay (int start) {
1410 1410
 
1411 1411
 			scorerow[0] = 0;
1412 1412
 			
1413  
-			fragcolor = playerstats[0] == 0 ? "FFF" : scr_scoreboard_fragcolor.string;
1414  
-			deathcolor = playerstats[1] == 0 ? "FFF" : scr_scoreboard_deathcolor.string;
1415  
-			tkcolor = playerstats[2] == 0 ? "FFF" : scr_scoreboard_tkcolor.string;
  1413
+			kill_color = playerstats[0] == 0 ? "FFF" : scr_scoreboard_kill_color.string;
  1414
+			death_color = playerstats[1] == 0 ? "FFF" : scr_scoreboard_death_color.string;
  1415
+			tk_color = playerstats[2] == 0 ? "FFF" : scr_scoreboard_tk_color.string;
1416 1416
 			
1417 1417
 			if (stats_team)
1418  
-				snprintf (scorerow, sizeof(scorerow), " &c%s%3i  &c%s%3i &c%s%3i ", fragcolor, playerstats[0], tkcolor, playerstats[2], deathcolor, playerstats[1]);
  1418
+				snprintf (scorerow, sizeof(scorerow), " &c%s%3i  &c%s%3i &c%s%3i ", kill_color, playerstats[0], tk_color, playerstats[2], death_color, playerstats[1]);
1419 1419
 			else
1420  
-				snprintf (scorerow, sizeof(scorerow), " &c%s%3i  &c%s%3i ", fragcolor, playerstats[0], deathcolor, playerstats[1]);
  1420
+				snprintf (scorerow, sizeof(scorerow), " &c%s%3i  &c%s%3i ", kill_color, playerstats[0], death_color, playerstats[1]);
1421 1421
 			
1422 1422
 			if (stats_touches) // flag touches
1423 1423
 			{

0 notes on commit 6659f50

Please sign in to comment.
Something went wrong with that request. Please try again.