Merge MR 'Various Q3 and QL map entity features and fixes'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / keyhunt / cl_keyhunt.qc

diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/cl_keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/cl_keyhunt.qc
index e95275eba9a1af2078644a103c19495ca16064a9..1600d1e2b3c615e40ec93bfe140a3ba2f335b9a0 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/keyhunt/cl_keyhunt.qc
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/cl_keyhunt.qc
@@ -10,7 +10,7 @@ void HUD_Mod_KH(vector pos, vector mySize)
        mod_active = 1; // keyhunt should never hide the mod icons panel
 
        // Read current state
-       int state = STAT(KH_KEYS);
+       int state = STAT(OBJECTIVE_STATUS);
        if(!state) return;
 
        int i, key_state;
@@ -85,6 +85,7 @@ void HUD_Mod_KH(vector pos, vector mySize)
                        case NUM_TEAM_4: if(team4_keys == all_keys) alpha = blink; break;
                }
        }
+       alpha *= panel_fg_alpha;
 
        // Draw icons