hud_panel_score_rankings 1 always show my own score; 2 pure rankings

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index bb5dfcf87cc87e54cb68ddf241d78a5f33ebc3c7..c67bf29efe3171124f755145b7e1e9d3eaeb25d7 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1395,7 +1395,7 @@ seta hud_panel_radar_rotation 0   "rotation mode: you set what points up. 0 = play
 seta hud_panel_radar_zoommode 0        "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
 alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4"
 
-seta hud_panel_score_rankings 0 "show rankings in non-team games instead of the distribution"
+seta hud_panel_score_rankings 0 "show rankings in non-team games instead of the score difference: 1 always show my own score; 2 pure rankings"
 
 seta hud_panel_engineinfo_framecounter_time 0.1 "time between framerate display updates"
 seta hud_panel_engineinfo_framecounter_decimals 0 "amount of decimals to show"

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 30d0406f25ae0f542c9a578044932e0f0f389c1f..db87ef4183b54986f040e784d5b8757bffef9ada 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -3576,6 +3576,7 @@ void HUD_Radar(void)
 
 // Score (#7)
 //
+void HUD_UpdatePlayerTeams();
 void HUD_Score(void)
 {
        if(!autocvar__hud_configure && !autocvar_hud_panel_score)
@@ -3645,10 +3646,40 @@ void HUD_Score(void)
                        vector fontsize = '0.9 0.9 0' * height;
                        pos_y += height * (1 - 0.9) / 2;
 
+                       vector rgb;
+                       rgb = '1 1 1';
+
+                       if (!scoreboard_fade_alpha) // the scoreboard too calls HUD_UpdatePlayerTeams
+                               HUD_UpdatePlayerTeams();
+
                        float name_size = mySize_x*0.75;
-                       float i, name_pos;
+                       float i, me_printed;
                        for (pl = players.sort_next, i=0; pl && i<entries; pl = pl.sort_next, ++i)
                        {
+                               if (pl.team == COLOR_SPECTATOR)
+                                       continue;
+
+                               if (i == entries-1 && !me_printed && pl != me)
+                               if (cvar("hud_panel_score_rankings") == 1 && spectatee_status != -1)
+                               {
+                                       for (pl = me.sort_next; pl; pl = pl.sort_next)
+                                               if (pl.team != COLOR_SPECTATOR)
+                                                       break;
+
+                                       if (pl)
+                                               rgb = '1 1 0'; //not last but not among the leading players: yellow
+                                       else
+                                               rgb = '1 0 0'; //last: red
+                                       pl = me;
+                               }
+
+                               if (pl == me)
+                               {
+                                       if (i == 0)
+                                               rgb = '0 1 0'; //first: green
+                                       me_printed = 1;
+                                       drawfill(pos - eY * (height * (1 - 0.9) / 2), eX * mySize_x + eY * height, rgb, 0.3 * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               }
                                string s = textShortenToWidth(GetPlayerName(pl.sv_entnum), name_size, fontsize, stringwidth_colors);
                                drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, TRUE, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
                                drawstring(pos + eX * mySize_x*0.79, ftos(pl.(scores[ps_primary])), fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.c b/qcsrc/menu/xonotic/dialog_hudpanel_score.c
index 6a9417923108c4c96ea309cccbfa286df461466e..efd0b4b8114765d69e92a72207feeeaba87c9ff5 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_score.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_score.c
@@ -75,6 +75,9 @@ void XonoticHUDScoreDialog_fill(entity me)
                me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Score:"));
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 3.8, e = makeXonoticCheckBox(0, "hud_panel_score_rankings", "Show rankings in non-team games"));
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Rankings:"));
+               me.TD(me, 1, 2.6/3, e = makeXonoticRadioButton(1, "hud_panel_score_rankings", "0", "Off"));
+               me.TD(me, 1, 2.6/3, e = makeXonoticRadioButton(1, "hud_panel_score_rankings", "1", "And me"));
+               me.TD(me, 1, 2.6/3, e = makeXonoticRadioButton(1, "hud_panel_score_rankings", "2", "Pure"));
 }
 #endif