beginnings of qw protocol support

[xonotic/darkplaces.git] / sbar.c

diff --git a/sbar.c b/sbar.c
index 9501a26aee9b7aa680c354ce8c4d3ed59e346d83..f2d1da545a942de71dd6d904d1bf8d0bb257c4d8 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -99,15 +99,15 @@ sbarpic_t *zymsb_crosshair_left1;
 sbarpic_t *zymsb_crosshair_left2;
 sbarpic_t *zymsb_crosshair_right;
 
-cvar_t showfps = {CVAR_SAVE, "showfps", "0"};
-cvar_t showtime = {CVAR_SAVE, "showtime", "0"};
-cvar_t showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S"};
-cvar_t showdate = {CVAR_SAVE, "showdate", "0"};
-cvar_t showdate_format = {CVAR_SAVE, "showdate_format", "%Y-%m-%d"};
-cvar_t sbar_alpha_bg = {CVAR_SAVE, "sbar_alpha_bg", "0.4"};
-cvar_t sbar_alpha_fg = {CVAR_SAVE, "sbar_alpha_fg", "1"};
+cvar_t showfps = {CVAR_SAVE, "showfps", "0", "shows your rendered fps (frames per second)"};
+cvar_t showtime = {CVAR_SAVE, "showtime", "0", "shows current time of day (useful on screenshots)"};
+cvar_t showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S", "format string for time of day"};
+cvar_t showdate = {CVAR_SAVE, "showdate", "0", "shows current date (useful on screenshots)"};
+cvar_t showdate_format = {CVAR_SAVE, "showdate_format", "%Y-%m-%d", "format string for date"};
+cvar_t sbar_alpha_bg = {CVAR_SAVE, "sbar_alpha_bg", "0.4", "opacity value of the statusbar background image"};
+cvar_t sbar_alpha_fg = {CVAR_SAVE, "sbar_alpha_fg", "1", "opacity value of the statusbar weapon/item icons and numbers"};
 
-cvar_t cl_deathscoreboard = {0, "cl_deathscoreboard", "1"};
+cvar_t cl_deathscoreboard = {0, "cl_deathscoreboard", "1", "shows scoreboard (+showscores) while dead"};
 
 void Sbar_MiniDeathmatchOverlay (int x, int y);
 void Sbar_DeathmatchOverlay (void);
@@ -347,8 +347,8 @@ void sbar_newmap(void)
 
 void Sbar_Init (void)
 {
-       Cmd_AddCommand ("+showscores", Sbar_ShowScores);
-       Cmd_AddCommand ("-showscores", Sbar_DontShowScores);
+       Cmd_AddCommand ("+showscores", Sbar_ShowScores, "show scoreboard");
+       Cmd_AddCommand ("-showscores", Sbar_DontShowScores, "hide scoreboard");
        Cvar_RegisterVariable (&showfps);
        Cvar_RegisterVariable (&showtime);
        Cvar_RegisterVariable (&showtime_format);
@@ -549,13 +549,24 @@ void Sbar_SortFrags (void)
                color = -1;
                for (i=0 ; i<scoreboardlines ; i++)
                {
-                       if (color != cl.scores[fragsort[i]].colors)
+                       if (color != (cl.scores[fragsort[i]].colors & 15))
                        {
-                               color = cl.scores[fragsort[i]].colors;
+                               color = cl.scores[fragsort[i]].colors & 15;
                                teamlines++;
-                               strcpy(teams[teamlines-1].name, "Total Team Score");
+
+                               if (color == 4)
+                                       strcpy(teams[teamlines-1].name, "^1Red Team");
+                               else if (color == 13)
+                                       strcpy(teams[teamlines-1].name, "^4Blue Team");
+                               else if (color == 9)
+                                       strcpy(teams[teamlines-1].name, "^6Pink Team");
+                               else if (color == 12)
+                                       strcpy(teams[teamlines-1].name, "^3Yellow Team");
+                               else
+                                       strcpy(teams[teamlines-1].name, "Total Team Score");
+                               
                                teams[teamlines-1].frags = 0;
-                               teams[teamlines-1].colors = cl.scores[fragsort[i]].colors;
+                               teams[teamlines-1].colors = color + 16 * color;
                        }
 
                        if (cl.scores[fragsort[i]].frags != -666)