Merge branch 'master' into Mario/survival

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / survival / cl_survival.qc

diff --git a/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc b/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc
index cde9da87e0f1385b57c38388589fdfcacc22419f..c35418647ed9c78b66407895d25b501f68749f6e 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc
+++ b/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc
@@ -29,30 +29,7 @@ void HUD_Mod_Survival(vector pos, vector mySize)
                return;
        }
 
-       string time_text = string_null;
-       vector timer_color = '1 1 1';
-       if(!STAT(GAME_STOPPED) && !warmup_stage && STAT(SURVIVAL_ROUNDTIMER) > 0)
-       {
-               float timeleft = max(0, STAT(SURVIVAL_ROUNDTIMER) - time);
-               timeleft = ceil(timeleft);
-               float minutesLeft = floor(timeleft / 60);
-               time_text = seconds_tostring(timeleft);
-               if(intermission_time || minutesLeft >= 5 || warmup_stage || STAT(SURVIVAL_ROUNDTIMER) == 0)
-                       timer_color = '1 1 1'; //white
-               else if(minutesLeft >= 1)
-                       timer_color = '1 1 0'; //yellow
-               else
-                       timer_color = '1 0 0'; //red
-       }
-
-       //drawpic_aspect_skin(pos, player_icon, vec2(0.5 * mySize.x, mySize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       if(!time_text)
-               drawstring_aspect(pos, player_text, vec2(mySize.x, mySize.y), player_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-       else
-       {
-               drawstring_aspect(pos, player_text, vec2(0.5 * mySize.x, mySize.y), player_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect(pos + eX * (0.5 * mySize.x), time_text, vec2(0.5 * mySize.x, mySize.y), timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-       }
+       drawstring_aspect(pos, player_text, vec2(mySize.x, mySize.y), player_color, panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 REGISTER_MUTATOR(cl_sv, true);
@@ -74,3 +51,9 @@ MUTATOR_HOOKFUNCTION(cl_sv, ForcePlayercolors_Skip, CBC_ORDER_LAST)
        player.colormap = 1024 + plcolor;
        return true;
 }
+
+MUTATOR_HOOKFUNCTION(cl_sv, DrawScoreboard_Force)
+{
+       // show the scoreboard when the round ends, so players can see who the hunter was
+       return STAT(GAME_STOPPED);
+}