Merge branch 'master' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / all.qc

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index d6e7cdbe72c315bda572d9b71d8b6eab272bf0ae..36f555be3709cd9e021517ce2feef4628e3bd653 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -3,54 +3,52 @@
 #define WEAPONS_ALL_C
 
 #if defined(CSQC)
-       #include "../constants.qh"
-       #include "../stats.qh"
-       #include <lib/warpzone/anglestransform.qh>
-       #include <lib/warpzone/common.qh>
-       #include <lib/warpzone/client.qh>
-       #include "../util.qh"
        #include <client/autocvars.qh>
-       #include "../deathtypes/all.qh"
-       #include <lib/csqcmodel/interpolate.qh>
-       #include "../physics/movetypes/movetypes.qh"
        #include <client/main.qh>
+       #include <common/constants.qh>
+       #include <common/deathtypes/all.qh>
+       #include <common/physics/movetypes/movetypes.qh>
+       #include <common/stats.qh>
+       #include <common/util.qh>
+       #include <common/weapons/calculations.qc>
+       #include <common/weapons/weapon/_mod.inc>
        #include <lib/csqcmodel/cl_model.qh>
+       #include <lib/csqcmodel/interpolate.qh>
+       #include <lib/warpzone/anglestransform.qh>
+       #include <lib/warpzone/client.qh>
+       #include <lib/warpzone/common.qh>
 #elif defined(MENUQC)
+       #include <common/weapons/weapon/_mod.inc>
 #elif defined(SVQC)
+       #include <common/constants.qh>
+       #include <common/deathtypes/all.qh>
        #include <common/items/_mod.qh>
+       #include <common/mapinfo.qh>
+       #include <common/monsters/_mod.qh>
+       #include <common/notifications/all.qh>
+       #include <common/stats.qh>
+       #include <common/teams.qh>
+       #include <common/util.qh>
+       #include <common/weapons/calculations.qc>
+       #include <common/weapons/config.qc>
+       #include <common/weapons/config.qh>
+       #include <common/weapons/weapon/_mod.inc>
+       #include <lib/csqcmodel/sv_model.qh>
        #include <lib/warpzone/anglestransform.qh>
        #include <lib/warpzone/common.qh>
-       #include <lib/warpzone/util_server.qh>
        #include <lib/warpzone/server.qh>
-       #include "../constants.qh"
-       #include "../stats.qh"
-       #include "../teams.qh"
-       #include <common/util.qh>
-       #include "../monsters/_mod.qh"
-       #include "config.qh"
-       #include <server/weapons/common.qh>
-       #include <server/weapons/csqcprojectile.qh>
-       #include <server/weapons/tracing.qh>
-       #include <server/items/spawning.qh>
+       #include <lib/warpzone/util_server.qh>
        #include <server/autocvars.qh>
-       #include "../notifications/all.qh"
-       #include "../deathtypes/all.qh"
-       #include <server/mutators/_mod.qh>
-       #include "../mapinfo.qh"
        #include <server/command/_mod.qh>
-       #include <lib/csqcmodel/sv_model.qh>
+       #include <server/hook.qh>
+       #include <server/items/spawning.qh>
+       #include <server/mutators/_mod.qh>
        #include <server/portals.qh>
-#include <server/hook.qh>
-#endif
-#ifdef GAMEQC
-       #include "calculations.qc"
-#endif
-#ifdef SVQC
-       #include "config.qc"
+       #include <server/weapons/common.qh>
+       #include <server/weapons/csqcprojectile.qh>
+       #include <server/weapons/tracing.qh>
 #endif
 
-#include "weapon/_mod.inc"
-
 
 // WEAPON PLUGIN SYSTEM