X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fclanarena%2Fcl_clanarena.qc;h=2bded9d6a9e861670b34355ec9a28b430606ddf0;hb=53c87b81040e9c1d52320952a9c3a06d3429be3b;hp=2bf470f1563c36be8bb6f84dd83ba54d792c45b3;hpb=02b5d16c4530ee9c47df90430657a42e5a170c25;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc index 2bf470f15..2bded9d6a 100644 --- a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc +++ b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc @@ -42,16 +42,8 @@ void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, int drawstring_aspect(myPos, ftos(stat), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL); } -// Clan Arena and Freeze Tag HUD modicons -void HUD_Mod_CA(vector myPos, vector mySize) +void HUD_Mod_CA_Draw(vector myPos, vector mySize, int layout) { - mod_active = 1; // required in each mod function that always shows something - - int layout; - if(ISGAMETYPE(CA)) - layout = autocvar_hud_panel_modicons_ca_layout; - else //if(ISGAMETYPE(FREEZETAG)) - layout = autocvar_hud_panel_modicons_freezetag_layout; int rows, columns; float aspect_ratio; aspect_ratio = (layout) ? 2 : 1; @@ -77,3 +69,11 @@ void HUD_Mod_CA(vector myPos, vector mySize) } } } + +// Clan Arena and Freeze Tag HUD modicons +void HUD_Mod_CA(vector myPos, vector mySize) +{ + mod_active = 1; // required in each mod function that always shows something + + HUD_Mod_CA_Draw(myPos, mySize, autocvar_hud_panel_modicons_ca_layout); +}