]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix infection mod icon
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 13 May 2015 10:12:41 +0000 (20:12 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 13 May 2015 10:12:41 +0000 (20:12 +1000)
gfx/hud/default/player_neutral.tga [new file with mode: 0644]
qcsrc/client/hud.qc

diff --git a/gfx/hud/default/player_neutral.tga b/gfx/hud/default/player_neutral.tga
new file mode 100644 (file)
index 0000000..757ee7d
Binary files /dev/null and b/gfx/hud/default/player_neutral.tga differ
index 587a5ff9709443ad8525f2d734e2fcf72bd7b81c..104f1b4eff59a69bc206d346b60f3cf0943f9110 100644 (file)
@@ -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