Merge master into qc_physics_prehax (blame TimePath if it's completely broken)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_items.qc

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index f817957c8213d62df0ea1dd856bb446760708728..4e3e376e3b26625d03bb5c8ff1cd8f22c20a60c0 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -5,7 +5,6 @@
 #if defined(SVQC)
     #include "_all.qh"
 
-    #include "g_subs.qh"
     #include "waypointsprites.qh"
 
     #include "bot/bot.qh"
@@ -20,6 +19,7 @@
     #include "../common/constants.qh"
     #include "../common/deathtypes.qh"
     #include "../common/notifications.qh"
+       #include "../common/triggers/subs.qh"
     #include "../common/util.qh"
 
     #include "../common/monsters/all.qh"