From: TimePath Date: Wed, 13 May 2015 10:12:41 +0000 (+1000) Subject: Fix infection mod icon X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=059eeac4c486bb2d51b77d1dec2684c0cd9a8450;p=xonotic%2Fxonotic-data.pk3dir.git Fix infection mod icon --- diff --git a/gfx/hud/default/player_neutral.tga b/gfx/hud/default/player_neutral.tga new file mode 100644 index 0000000000..757ee7d2ea Binary files /dev/null and b/gfx/hud/default/player_neutral.tga differ diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 587a5ff970..104f1b4eff 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -3136,6 +3136,14 @@ void HUD_Mod_KH(vector pos, vector mySize) drawpic_aspect_skin(KH_SLOTS[i++], "kh_dropped", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL); } +void HUD_Mod_Infection(vector pos, vector mySize) +{ + mod_active = 1; // Infection should always show the mod HUD + float f = stof(getplayerkeyvalue(player_localentnum - 1, "colors")); + vector color = colormapPaletteColor(floor(f / 16), 0); + drawpic_aspect_skin(pos, "player_neutral", mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL); +} + // Keepaway HUD mod icon int kaball_prevstatus; // last remembered status float kaball_statuschange_time; // time when the status changed @@ -3143,17 +3151,6 @@ float kaball_statuschange_time; // time when the status changed // we don't need to reset for keepaway since it immediately // autocorrects prevstatus as to if the player has the ball or not -void HUD_Mod_Infection(vector pos, vector mySize) -{ - mod_active = 1; // Infection should never hide the mod icons panel - - float f = stof(getplayerkeyvalue(player_localentnum - 1, "colors")); - - vector rgb = colormapPaletteColor(floor(f / 16), 0); - - drawpic_aspect_skin(pos, "player", mySize, rgb, panel_fg_alpha, DRAWFLAG_NORMAL); -} - void HUD_Mod_Keepaway(vector pos, vector mySize) { mod_active = 1; // keepaway should always show the mod HUD