Merge branch 'Mario/bot_maxplayers' into 'master'

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

diff --git a/qcsrc/common/mapobjects/triggers.qc b/qcsrc/common/mapobjects/triggers.qc
index 6968a6556a0ce2a18571a647603c228148c9bb4b..6a20959997b34439e24d3fc7ceae7cbef35cb1fa 100644 (file)
--- a/qcsrc/common/mapobjects/triggers.qc
+++ b/qcsrc/common/mapobjects/triggers.qc
@@ -1,7 +1,4 @@
 #include "triggers.qh"
-#ifdef SVQC
-       #include <server/item_key.qh>
-#endif
 
 void SUB_DontUseTargets(entity this, entity actor, entity trigger) { }
 
@@ -79,7 +76,7 @@ void generic_netlinked_reset(entity this)
 // Compatibility with old maps
 void generic_netlinked_legacy_use(entity this, entity actor, entity trigger)
 {
-       LOG_WARNF("Entity %s was (de)activated by a trigger, please update map to use relays", this.targetname);
+       //LOG_WARNF("Entity %s was (de)activated by a trigger, please update map to use relays", this.targetname);
        this.setactive(this, ACTIVE_TOGGLE);
 }