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

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

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index c101236f8974cbe84d497cf7f72d74eb30ea37c7..7a127eddab3971938567faa9479a1f64c9930222 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -6,13 +6,12 @@
 #include "weapons/selection.qh"
 #include "weapons/tracing.qh"
 #include "cl_player.qh"
-#include "t_teleporters.qh"
 #include "command/common.qh"
 #include "round_handler.qh"
 #include "vehicles/vehicle.qh"
 #include "../common/constants.qh"
 #include "../common/util.qh"
-#include "../common/weapons/weapons.qh"
+#include "../common/weapons/all.qh"
 #include "../warpzonelib/common.qh"
 #include "../warpzonelib/server.qh"