Update more include paths to simplify log output

diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc
index 2b52a9fab14e60207083c90d1da5d05671ddeec0..6481d6b1d4a61aca30e4b6ff746f39d75ee6830a 100644 (file)
--- a/qcsrc/client/commands/cl_cmd.qc
+++ b/qcsrc/client/commands/cl_cmd.qc
@@ -8,7 +8,7 @@
 
 #include "../autocvars.qh"
 #include "../defs.qh"
-#include "../hud/all.qh"
+#include <client/hud/all.qh>
 #include "../main.qh"
 #include "../mapvoting.qh"
 #include "../miscfunctions.qh"

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 2664354110b0631ee7617d99fe0d73b210cef44c..a745bcd31f5d3bbf374b11bb6701a57ca42aed85 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -2,7 +2,7 @@
 
 #include "hud/all.qh"
 
-#include "../common/mutators/mutator/waypoints/all.qh"
+#include <common/mutators/mutator/waypoints/all.qh>
 
 #include "../lib/csqcmodel/interpolate.qh"
 

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index a05407e9023d1b8df08e2d289aac957577f9dfe9..207a4688377de35ec3c9d85fa68902cdfd62ee1a 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -12,14 +12,14 @@
 #include "../common/constants.qh"
 #include "../common/debug.qh"
 #include "../common/mapinfo.qh"
-#include "../common/gamemodes/all.qh"
+#include <common/gamemodes/all.qh>
 #include "../common/physics/player.qh"
 #include "../common/stats.qh"
 #include "../common/triggers/target/music.qh"
 #include "../common/teams.qh"
 
-#include "../common/vehicles/all.qh"
-#include "../common/weapons/all.qh"
+#include <common/vehicles/all.qh>
+#include <common/weapons/all.qh>
 #include "../common/viewloc.qh"
 #include "../common/minigames/cl_minigames.qh"
 #include "../common/minigames/cl_minigames_hud.qh"

diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index b2cc26fd9a96d262377e0c9351bcf0e2df61016e..f8561b53ca6e3d68efa0301aa6b6e08dab2ab494 100644 (file)
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -1,6 +1,6 @@
 #include "animdecide.qh"
 
-#include "monsters/all.qh"
+#include <common/monsters/all.qh>
 
 #if defined(SVQC)
     #include "util.qh"

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index b4cd541844576f7e7bef9163fe5b999394a7622b..56dcce489cfa9fad4275d0e077a9cf8c16c6a85f 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1,12 +1,12 @@
 #if defined(CSQC)
     #include "../client/defs.qh"
     #include "util.qh"
-    #include "weapons/all.qh"
+    #include <common/weapons/all.qh>
     #include "mapinfo.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include "util.qh"
-    #include "monsters/all.qh"
+    #include <common/monsters/all.qh>
     #include "mapinfo.qh"
 #endif
 

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 6181edcec817efb32ecabd0ecc7819b19487461a..b8f235e904fda1b674a85e501b2f99256bc2ce0a 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -8,7 +8,7 @@
     #include "../server/constants.qh"
     #include "../server/defs.qh"
     #include "notifications.qh"
-    #include "../server/mutators/all.qh"
+    #include <server/mutators/all.qh>
 #endif
 
 // ================================================

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index a3725cbd6ef8ac6bbcaca3bc256601b07945aaf9..1b27775d4ff64fa035485bb8781c52b6aec97b8c 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -1,7 +1,7 @@
 #ifndef NOTIFICATIONS_H
 #define NOTIFICATIONS_H
 
-#include "command/all.qh"
+#include <common/command/all.qh>
 
 #include "constants.qh"
 #include "teams.qh"

diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc
index ffd4fca7165589c2ce25602df0e2e2ab54c602d1..3d10ca8b5a43eb8ea71133b485edb35f00f9e96e 100644 (file)
--- a/qcsrc/common/playerstats.qc
+++ b/qcsrc/common/playerstats.qc
@@ -3,7 +3,7 @@
 #elif defined(SVQC)
     #include "constants.qh"
     #include "util.qh"
-    #include "weapons/all.qh"
+    #include <common/weapons/all.qh>
     #include "../server/weapons/accuracy.qh"
     #include "../server/defs.qh"
     #include "playerstats.qh"

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index da360c80d51eb2e73e703d19855faee3d22bcedc..97fc76c09826fecb9d3fc490602facddee058416 100644 (file)
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -7,26 +7,26 @@
     #include "../server/bot/bot.qh"
     #include "../server/bot/waypoints.qh"
 
-    #include "../server/mutators/all.qh"
+    #include <server/mutators/all.qh>
 
     #include "../server/weapons/common.qh"
     #include "../server/weapons/selection.qh"
     #include "../server/weapons/weaponsystem.qh"
 
     #include "constants.qh"
-    #include "deathtypes/all.qh"
-    #include "notifications.qh"
+    #include <common/deathtypes/all.qh>
+    #include <common/notifications.qh>
        #include "triggers/subs.qh"
     #include "util.qh"
 
-    #include "monsters/all.qh"
+    #include <common/monsters/all.qh>
 
-    #include "weapons/all.qh"
+    #include <common/weapons/all.qh>
 
     #include "../lib/warpzone/util_server.qh"
 #elif defined(CSQC)
        #include "physics/movetypes/movetypes.qh"
-       #include "weapons/all.qh"
+       #include <common/weapons/all.qh>
        #include "../lib/csqcmodel/cl_model.qh"
        #include "../lib/csqcmodel/common.qh"
 #endif

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index c81b1a5769942860beb7702b747d1ca01a4c53bf..52df2b6478a91d171940d32c0180938b471c0b12 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -6,7 +6,7 @@
        #include "../client/mutators/events.qh"
     #include "mapinfo.qh"
     #include "notifications.qh"
-    #include "deathtypes/all.qh"
+    #include <common/deathtypes/all.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include "constants.qh"
@@ -14,7 +14,7 @@
     #include "../server/defs.qh"
        #include "../server/mutators/events.qh"
     #include "notifications.qh"
-    #include "deathtypes/all.qh"
+    #include <common/deathtypes/all.qh>
     #include "mapinfo.qh"
 #endif
 

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 0438d42e0f68e8d7aade94e8f6b65d8c904014cf..4819f2c255d379144cd32f44031d9bfa496a50a4 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -21,7 +21,7 @@ WepSet ReadWepSet();
 
 #ifndef MENUQC
 #include "calculations.qh"
-#include "../models/all.qh"
+#include <common/models/all.qh>
 #endif
 
 #include "../util.qh"

diff --git a/qcsrc/server/_all.qh b/qcsrc/server/_all.qh
index 3636f89848037cf7770455030fc5203bd9b2c7f6..2b67138bcbfafbfecc248badcf7cbe9a74a025d4 100644 (file)
--- a/qcsrc/server/_all.qh
+++ b/qcsrc/server/_all.qh
@@ -42,9 +42,9 @@ const string STR_OBSERVER = "observer";
 
 // NOTE: FOR_EACH_MONSTER deprecated! Use the following instead: FOREACH_ENTITY_FLAGS(flags, FL_MONSTER, LAMBDA(yourcode));
 
-#include "../common/effects/all.qh"
-#include "../common/models/all.qh"
-#include "../common/sounds/all.qh"
+#include <common/effects/all.qh>
+#include <common/models/all.qh>
+#include <common/sounds/all.qh>
 
 #include "autocvars.qh"
 #include "constants.qh"