From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 31 Jan 2015 08:14:09 +0000 (+1100)
Subject: Tweak the order of some #includes
X-Git-Tag: xonotic-v0.8.1~133^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6cc3c69938cd99cfba8aa61a5a28685659f8001;p=xonotic%2Fxonotic-data.pk3dir.git

Tweak the order of some #includes
---

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 64813f2f4..99fecda0b 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1,9 +1,10 @@
+#include "util.qh"
+
 #if defined(CSQC)
 	#include "../dpdefs/csprogsdefs.qh"
     #include "../client/defs.qh"
     #include "constants.qh"
     #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
     #include "mapinfo.qh"
     #include "notifications.qh"
     #include "deathtypes.qh"
@@ -13,7 +14,6 @@
     #include "../dpdefs/dpextensions.qh"
     #include "../warpzonelib/mathlib.qh"
     #include "constants.qh"
-    #include "util.qh"
     #include "../server/autocvars.qh"
     #include "../server/defs.qh"
     #include "notifications.qh"
diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/weapons.qc
index b9079a58f..2b2fca39d 100644
--- a/qcsrc/common/weapons/weapons.qc
+++ b/qcsrc/common/weapons/weapons.qc
@@ -1,6 +1,8 @@
 #ifndef WEAPONS_C
 #define WEAPONS_C
 
+#include "weapons.qh"
+
 #if defined(CSQC)
 	#include "../../dpdefs/csprogsdefs.qh"
 	#include "../../client/defs.qh"
@@ -12,7 +14,6 @@
 	#include "../../warpzonelib/client.qh"
 	#include "../util.qh"
 	#include "../buffs.qh"
-	#include "weapons.qh"
 	#include "../../client/autocvars.qh"
 	#include "../deathtypes.qh"
 	#include "../../csqcmodellib/interpolate.qh"
@@ -35,7 +36,6 @@
     #include "../buffs.qh"
     #include "../monsters/monsters.qh"
     #include "config.qh"
-    #include "weapons.qh"
     #include "../../server/weapons/csqcprojectile.qh"
     #include "../../server/weapons/tracing.qh"
     #include "../../server/t_items.qh"