Merge branch 'master' into TimePath/gametypes/infection

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / modicons.qc

diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc
index 0705ddfe5c3091cf1fe2b48e72b2437da69dc664..6d0ce7809602baaae98926308657ad4235b253d3 100644 (file)
--- a/qcsrc/client/hud/panel/modicons.qc
+++ b/qcsrc/client/hud/panel/modicons.qc
@@ -399,6 +399,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
+       int 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
@@ -729,6 +737,7 @@ void HUD_ModIcons_SetFunc()
                case MAPINFO_TYPE_FREEZETAG:    HUD_ModIcons_GameType = HUD_Mod_CA; break;
                case MAPINFO_TYPE_DOMINATION:   HUD_ModIcons_GameType = HUD_Mod_Dom; break;
                case MAPINFO_TYPE_KEEPAWAY:     HUD_ModIcons_GameType = HUD_Mod_Keepaway; break;
+               case MAPINFO_TYPE_INFECTION: HUD_ModIcons_GameType = HUD_Mod_Infection; break;
        }
 }