Merge branch 'master' into terencehill/menu_weaponarena_selection_fix

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / multi.qc

diff --git a/qcsrc/common/triggers/trigger/multi.qc b/qcsrc/common/triggers/trigger/multi.qc
index b85258702771c69d620f18dfa9025f9a4865970f..0e9a02016ca4fd7109561683785891a32e227444 100644 (file)
--- a/qcsrc/common/triggers/trigger/multi.qc
+++ b/qcsrc/common/triggers/trigger/multi.qc
@@ -82,6 +82,12 @@ void multi_touch()
                        return;         // not facing the right way
        }
 
+       // if the trigger has pressed keys, check that the player is pressing those keys
+       if(self.pressedkeys)
+       if(IS_PLAYER(other)) // only for players
+       if(!(other.pressedkeys & self.pressedkeys))
+               return;
+
        EXACTTRIGGER_TOUCH;
 
        self.enemy = other;