Cvar hud_panel_score_rankings to enable rankings not only when observing

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index af48f639d4b7368d12e6ef9f021c091235efcf16..bb5dfcf87cc87e54cb68ddf241d78a5f33ebc3c7 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1395,6 +1395,8 @@ 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_engineinfo_framecounter_time 0.1 "time between framerate display updates"
 seta hud_panel_engineinfo_framecounter_decimals 0 "amount of decimals to show"
 seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index b0a814b792f354c6f6c84663f9e2405fbe7027d6..30d0406f25ae0f542c9a578044932e0f0f389c1f 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -3636,7 +3636,7 @@ void HUD_Score(void)
                drawstring_aspect(pos, timer, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                drawfont = hud_font;
        } else if (!teamplay) { // non-teamgames
-               if (spectatee_status == -1)
+               if (spectatee_status == -1 || cvar("hud_panel_score_rankings"))
                {
 #define SCOREPANEL_MAX_ENTRIES 6
 #define SCOREPANEL_ASPECTRATIO 2

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.c b/qcsrc/menu/xonotic/dialog_hudpanel_score.c
index 8c8561ea79b07aafd9867dbd0017e7ce4b3e226e..6a9417923108c4c96ea309cccbfa286df461466e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_score.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_score.c
@@ -71,5 +71,10 @@ void XonoticHUDScoreDialog_fill(entity me)
                                for(i = 0; i <= 10; ++i)
                                        e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
                                e.configureXonoticTextSliderValues(e);
+       me.TR(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"));
 }
 #endif