Merge branch 'master' into terencehill/scoreboard_panel_2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / include.qh

diff --git a/qcsrc/common/triggers/include.qh b/qcsrc/common/triggers/include.qh
index 705dec7f17ed513e3ab1f51245ec02d0dca39ce2..25688e3ecb692e7114c6ec739d5dbf83236d7aa9 100644 (file)
--- a/qcsrc/common/triggers/include.qh
+++ b/qcsrc/common/triggers/include.qh
@@ -1,19 +1,22 @@
+#ifndef TRIGGERS_INCLUDE_H
+#define TRIGGERS_INCLUDE_H
+
 // some required common stuff
 #ifdef CSQC
-       #include "../../server/item_key.qh"
+       #include <server/item_key.qh>
 #endif
 #include "triggers.qh"
 #include "subs.qh"
 #include "platforms.qh"
+#include "teleporters.qh"
 
 // func
 #include "func/include.qh"
 
-// misc
-#include "misc/include.qh"
-
 // target
 #include "target/include.qh"
 
 // trigger
 #include "trigger/include.qh"
+
+#endif