Merge branch 'master' into terencehill/lms_updates

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

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index cda65308d721ef3e45564dc6d90f48b4e1f43bf5..a368938c2ddd37595fa7db9cb9ad96517ab25a4d 100644 (file)
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -1,14 +1,12 @@
 #include "campaign.qh"
 
+#include <common/campaign_common.qh>
 #include <common/mapinfo.qh>
-#include <common/weapons/_all.qh>
 #include <common/stats.qh>
-
-#include "cheats.qh"
+#include <common/weapons/_all.qh>
+#include <server/cheats.qh>
 #include <server/intermission.qh>
-#include "world.qh"
-
-#include "../common/campaign_common.qh"
+#include <server/world.qh>
 
 // campaign cvars:
 //   _campaign_index: index of CURRENT map