X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fsurvival%2Fcl_survival.qc;h=02d0907abccf0a40b28a6c388455fd962cd8f2ad;hb=refs%2Fheads%2FMario%2Fsurvival;hp=a766b29fbe94f529e7f2f6dc2fed8fc91ba6a549;hpb=073fbf90e9d24c6cf3916dd3af9a1b3978d56ee7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc b/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc index a766b29fb..02d0907ab 100644 --- a/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc +++ b/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc @@ -1,5 +1,6 @@ #include "cl_survival.qh" +#include #include void HUD_Mod_Survival(vector pos, vector mySize) @@ -28,17 +29,16 @@ void HUD_Mod_Survival(vector pos, vector mySize) return; } - //drawpic_aspect_skin(pos, player_icon, vec2(0.5 * mySize.x, mySize.y), '1 1 1', 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_surv, true); -MUTATOR_HOOKFUNCTION(cl_surv, ForcePlayercolors_Skip) +MUTATOR_HOOKFUNCTION(cl_surv, ForcePlayercolors_Skip, CBC_ORDER_LAST) { if(!ISGAMETYPE(SURVIVAL)) return false; - + entity player = M_ARGV(0, entity); entity e = entcs_receiver(player.entnum - 1); int surv_status = ((e) ? e.survival_status : 0); @@ -51,3 +51,9 @@ MUTATOR_HOOKFUNCTION(cl_surv, ForcePlayercolors_Skip) player.colormap = 1024 + plcolor; return true; } + +MUTATOR_HOOKFUNCTION(cl_surv, DrawScoreboard_Force) +{ + // show the scoreboard when the round ends, so players can see who the hunter was + return STAT(GAME_STOPPED); +}