Makefile: use `-I.`

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index dac7cb2bdd6d164447016e9fff0de3654ab82295..ac418a5fae9a7df4290b8a5823e24b5394186bd7 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -48,24 +48,24 @@ $(QCCVERSIONFILE):
        echo This file intentionally left blank. > $@
 
 ../csprogs.dat: client/progs.inc $(QCCVERSIONFILE)
-       $(CC) -xc $(QCCDEFS) -DCSQC -E -MMD -MP -MT $@ -Wall -Wundef -Werror -CC -o tmp/client.qc $<
-       @$(CC) -xc $(QCCDEFS) -DCSQC -E -dM 1>tmp/client_macros.txt -H 2>tmp/client_includes.txt $<
+       $(CC) -xc -I. $(QCCDEFS) -DCSQC -E -MMD -MP -MT $@ -Wall -Wundef -Werror -CC -o tmp/client.qc $<
+       @$(CC) -xc -I. $(QCCDEFS) -DCSQC -E -dM 1>tmp/client_macros.txt -H 2>tmp/client_includes.txt $<
        @sed -i 's/^# \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\2)\n#pragma line(\1)/g' tmp/client.qc
        @echo make[1]: Entering directory \`$(PWD)/client\'
        cd client && $(QCC) $(QCCFLAGS) -o ../$@ ../tmp/client.qc
 -include tmp/client.d
 
 ../progs.dat: server/progs.inc $(QCCVERSIONFILE)
-       $(CC) -xc $(QCCDEFS) -DSVQC -E -MMD -MP -MT $@ -Wall -Wundef -Werror -CC -o tmp/server.qc $<
-       @$(CC) -xc $(QCCDEFS) -DSVQC -E -dM 1>tmp/server_macros.txt -H 2>tmp/server_includes.txt $<
+       $(CC) -xc -I. $(QCCDEFS) -DSVQC -E -MMD -MP -MT $@ -Wall -Wundef -Werror -CC -o tmp/server.qc $<
+       @$(CC) -xc -I. $(QCCDEFS) -DSVQC -E -dM 1>tmp/server_macros.txt -H 2>tmp/server_includes.txt $<
        @sed -i 's/^# \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\2)\n#pragma line(\1)/g' tmp/server.qc
        @echo make[1]: Entering directory \`$(PWD)/server\'
        cd server && $(QCC) $(QCCFLAGS) -o ../$@ ../tmp/server.qc
 -include tmp/server.d
 
 ../menu.dat: menu/progs.inc $(QCCVERSIONFILE)
-       $(CC) -xc $(QCCDEFS) -DMENUQC -E -MMD -MP -MT $@ -Wall -Wundef -Werror -CC -o tmp/menu.qc $<
-       @$(CC) -xc $(QCCDEFS) -DMENUQC -E -dM 1>tmp/menu_macros.txt -H 2>tmp/menu_includes.txt $<
+       $(CC) -xc -I. $(QCCDEFS) -DMENUQC -E -MMD -MP -MT $@ -Wall -Wundef -Werror -CC -o tmp/menu.qc $<
+       @$(CC) -xc -I. $(QCCDEFS) -DMENUQC -E -dM 1>tmp/menu_macros.txt -H 2>tmp/menu_includes.txt $<
        @sed -i 's/^# \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\2)\n#pragma line(\1)/g' tmp/menu.qc
        @echo make[1]: Entering directory \`$(PWD)/menu\'
        cd menu && $(QCC) $(QCCFLAGS) -o ../$@ ../tmp/menu.qc

diff --git a/qcsrc/client/_all.qh b/qcsrc/client/_all.qh
index adff5ccff49eef81586f341d4ea2f94f66223ae1..5297347533bbd341c854d4be567b6595a4d9bfbe 100644 (file)
--- a/qcsrc/client/_all.qh
+++ b/qcsrc/client/_all.qh
@@ -1,11 +1,11 @@
 #ifndef CLIENT_ALL_H
 #define CLIENT_ALL_H
 
-#include "../common/util.qh"
+#include <common/util.qh>
 
-#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 "defs.qh"

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 109d014374bff33184d39b5a4deafb855ea757e6..707e3c8a7657e5b6c8d3495cefe5875ff1111e83 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -2,8 +2,8 @@
 
 #include "mutators/events.qh"
 
-#include "../common/notifications.qh"
-#include "../common/stats.qh"
+#include <common/notifications.qh>
+#include <common/stats.qh>
 
 bool announcer_1min;
 bool announcer_5min;

diff --git a/qcsrc/client/commands/all.qc b/qcsrc/client/commands/all.qc
index 45d9eaaa806218e74144938741a7c5eb36f46320..d37165ca9611e9116c33ea23049fe97e6bce99a4 100644 (file)
--- a/qcsrc/client/commands/all.qc
+++ b/qcsrc/client/commands/all.qc
@@ -1,3 +1,3 @@
-#include "../../common/command/all.qc"
+#include <common/command/all.qc>
 
 #include "cl_cmd.qc"

diff --git a/qcsrc/client/commands/all.qh b/qcsrc/client/commands/all.qh
index eb092c12b644ed81a6c940f3941c29a5f486f248..cdaf8c55f727836a7ac89649fdaf9a77b1da799f 100644 (file)
--- a/qcsrc/client/commands/all.qh
+++ b/qcsrc/client/commands/all.qh
@@ -1,7 +1,7 @@
 #ifndef CLIENT_COMMANDS_ALL_H
 #define CLIENT_COMMANDS_ALL_H
 
-#include "../../common/commands/all.qh"
+#include <common/commands/all.qh>
 
 #include "cl_cmd.qh"
 

diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc
index 24833d834704777fd88279fec7095ec08500f1a9..2b52a9fab14e60207083c90d1da5d05671ddeec0 100644 (file)
--- a/qcsrc/client/commands/cl_cmd.qc
+++ b/qcsrc/client/commands/cl_cmd.qc
@@ -3,7 +3,7 @@
 //  Last updated: December 28th, 2011
 // ==============================================
 
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 #include "cl_cmd.qh"
 
 #include "../autocvars.qh"
@@ -15,9 +15,9 @@
 
 #include "../mutators/events.qh"
 
-#include "../../common/mapinfo.qh"
+#include <common/mapinfo.qh>
 
-#include "../../common/command/generic.qh"
+#include <common/command/generic.qh>
 
 void DrawDebugModel(entity this)
 {

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 322946740af1c41a56c984146f585cefd9062195..64e0eca580e7ffe16683339f45e00af379e8692a 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -1,12 +1,12 @@
 #include "mutators/events.qh"
 #include "player_skeleton.qh"
 #include "weapons/projectile.qh"
-#include "../common/animdecide.qh"
-#include "../common/physics/movetypes/movetypes.qh"
-#include "../common/viewloc.qh"
-#include "../lib/csqcmodel/cl_model.qh"
-#include "../lib/csqcmodel/cl_player.qh"
-#include "../lib/csqcmodel/interpolate.qh"
+#include <common/animdecide.qh>
+#include <common/physics/movetypes/movetypes.qh>
+#include <common/viewloc.qh>
+#include <lib/csqcmodel/cl_model.qh>
+#include <lib/csqcmodel/cl_player.qh>
+#include <lib/csqcmodel/interpolate.qh>
 
 .float death_time;
 .int modelflags;

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index 8d4759b1e98c96fcf4b80781aa101d4fc2a067b8..7b1aed1241a4d0896c45a06c5d8a94d8b6af20bf 100644 (file)
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -4,15 +4,15 @@
 #include "../mapvoting.qh"
 #include "../scoreboard.qh"
 #include "../teamradar.qh"
-#include "../../common/t_items.qh"
-#include "../../common/deathtypes/all.qh"
-#include "../../common/items/all.qc"
-#include "../../common/mapinfo.qh"
-#include "../../common/mutators/mutator/waypoints/all.qh"
-#include "../../common/stats.qh"
-#include "../../lib/csqcmodel/cl_player.qh"
+#include <common/t_items.qh>
+#include <common/deathtypes/all.qh>
+#include <common/items/all.qc>
+#include <common/mapinfo.qh>
+#include <common/mutators/mutator/waypoints/all.qh>
+#include <common/stats.qh>
+#include <lib/csqcmodel/cl_player.qh>
 // TODO: remove
-#include "../../server/mutators/mutator/gamemode_ctf.qc"
+#include <server/mutators/mutator/gamemode_ctf.qc>
 
 
 /*

diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
index 363324252aae1ad12c0a966d3c1e60b9f335b642..45dd4887f2678ff435c54cb5a7b203d55c4f73b4 100644 (file)
--- a/qcsrc/client/hud/hud.qh
+++ b/qcsrc/client/hud/hud.qh
@@ -1,7 +1,7 @@
 #ifndef CLIENT_HUD_H
 #define CLIENT_HUD_H
 
-#include "../../common/weapons/all.qh"
+#include <common/weapons/all.qh>
 
 bool HUD_Radar_Clickable();
 void HUD_Radar_Mouse();

diff --git a/qcsrc/client/hud/panel/minigame.qc b/qcsrc/client/hud/panel/minigame.qc
index dbacddbe20bab025efa894d7f38acb54960f63e2..6979ee4136eba4b7e356db960395a0f54ed68d15 100644 (file)
--- a/qcsrc/client/hud/panel/minigame.qc
+++ b/qcsrc/client/hud/panel/minigame.qc
@@ -1,3 +1,3 @@
 // Minigame
 
-#include "../../../common/minigames/cl_minigames_hud.qc"
+#include <common/minigames/cl_minigames_hud.qc>

diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc
index 128d54aaabb05761aa657058ced28c860eb3c4bd..0ad5c4965b0141e0629b78634fac4b06db0629ab 100644 (file)
--- a/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@ -1,3 +1,3 @@
 // QuickMenu (#23)
 
-#include "../../quickmenu.qc"
+#include <client/quickmenu.qc>

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 2665f4ed1b8bb28cc453aa0e8bd99480fde78144..c910f925096c37ef5283bf5491d20275301d67ef 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1,26 +1,26 @@
 #include "main.qh"
 
-#include "../common/effects/qc/all.qh"
+#include <common/effects/qc/all.qh>
 #include "hud/all.qh"
 #include "mapvoting.qh"
 #include "mutators/events.qh"
 #include "quickmenu.qh"
 #include "scoreboard.qh"
 #include "shownames.qh"
-#include "../common/t_items.qh"
+#include <common/t_items.qh>
 #include "wall.qh"
 #include "weapons/projectile.qh"
-#include "../common/deathtypes/all.qh"
-#include "../common/items/all.qh"
-#include "../common/mapinfo.qh"
-#include "../common/minigames/cl_minigames.qh"
-#include "../common/minigames/cl_minigames_hud.qh"
-#include "../common/net_notice.qh"
-#include "../common/triggers/include.qh"
-#include "../common/vehicles/all.qh"
-#include "../lib/csqcmodel/cl_model.qh"
-#include "../lib/csqcmodel/interpolate.qh"
-#include "../lib/warpzone/client.qh"
+#include <common/deathtypes/all.qh>
+#include <common/items/all.qh>
+#include <common/mapinfo.qh>
+#include <common/minigames/cl_minigames.qh>
+#include <common/minigames/cl_minigames_hud.qh>
+#include <common/net_notice.qh>
+#include <common/triggers/include.qh>
+#include <common/vehicles/all.qh>
+#include <lib/csqcmodel/cl_model.qh>
+#include <lib/csqcmodel/interpolate.qh>
+#include <lib/warpzone/client.qh>
 
 // --------------------------------------------------------------------------
 // BEGIN REQUIRED CSQC FUNCTIONS

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 49a92bb45ca483a399ea675076121a345fb7afa4..6a0285d5f0aeac184d8c285802dc62c1bd8beb5a 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -1,8 +1,8 @@
 #ifndef CLIENT_MAIN_H
 #define CLIENT_MAIN_H
 
-#include "../common/constants.qh"
-#include "../common/weapons/all.qh"
+#include <common/constants.qh>
+#include <common/weapons/all.qh>
 
 // --------------------------------------------------------------------------
 // MENU Functionality

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index a134357aaad4b0eedae07e1c79d4191248031fc1..48d0843b0913c35ceca971a886b90f84bdc600a4 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -3,7 +3,7 @@
 #include "hud/all.qh"
 #include "scoreboard.qh"
 
-#include "../common/mapinfo.qh"
+#include <common/mapinfo.qh>
 
 
 int mv_num_maps;

diff --git a/qcsrc/client/mapvoting.qh b/qcsrc/client/mapvoting.qh
index 1c84419482c264b841ab336bf6dd351a88cb6b47..bbc05d884f9aa2e011b8f5bdd295063f0cf13c40 100644 (file)
--- a/qcsrc/client/mapvoting.qh
+++ b/qcsrc/client/mapvoting.qh
@@ -1,7 +1,7 @@
 #ifndef CLIENT_MAPVOTING_H
 #define CLIENT_MAPVOTING_H
 
-#include "../common/constants.qh"
+#include <common/constants.qh>
 void MapVote_Draw();
 
 void Cmd_MapVote_MapDownload(float argc);

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index b7962d52d5fb73e42cc2f8e802b9d016f6027565..0c262604b9397155405915700b94243a86497ee5 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -2,11 +2,11 @@
 
 #include "hud/all.qh"
 
-#include "../common/command/generic.qh"
+#include <common/command/generic.qh>
 
-#include "../common/teams.qh"
+#include <common/teams.qh>
 
-#include "../lib/csqcmodel/cl_model.qh"
+#include <lib/csqcmodel/cl_model.qh>
 
 
 void AuditLists()

diff --git a/qcsrc/client/mutators/events.qh b/qcsrc/client/mutators/events.qh
index 51af588393c660ae0890eaf07c955406f76b5b49..7141e4455e1849f4ccbd0d12aa55d095b612d4ac 100644 (file)
--- a/qcsrc/client/mutators/events.qh
+++ b/qcsrc/client/mutators/events.qh
@@ -1,7 +1,7 @@
 #ifndef CLIENT_MUTATORS_EVENTS_H
 #define CLIENT_MUTATORS_EVENTS_H
 
-#include "../../common/mutators/base.qh"
+#include <common/mutators/base.qh>
 
 // globals
 

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 48f02c4fe01bb4d3279c0bdf8ad86bb2eb747257..4ebe4afcfb7e8c55c64f6f8f0425c46b0f393976 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -5,12 +5,12 @@
 #include "../main.qh"
 #include "../mutators/events.qh"
 
-#include "../../common/constants.qh"
-#include "../../common/physics/movetypes/movetypes.qh"
+#include <common/constants.qh>
+#include <common/physics/movetypes/movetypes.qh>
 
-#include "../../lib/csqcmodel/interpolate.qh"
+#include <lib/csqcmodel/interpolate.qh>
 
-#include "../../lib/warpzone/anglestransform.qh"
+#include <lib/warpzone/anglestransform.qh>
 
 .float alpha;
 .float scale;

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 6931a98c2d8fbb964696923564a838ca1a84646a..378d8c8c625098df1fa6bebb57d9663ef4e1184e 100644 (file)
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -10,16 +10,16 @@
 #endif
 
 #ifdef CSQC
-       #include "../../client/commands/cl_cmd.qh"
+       #include <client/commands/cl_cmd.qh>
 #endif
 
 #ifdef SVQC
-       #include "../../server/command/banning.qh"
-       #include "../../server/command/cmd.qh"
-       #include "../../server/command/common.qh"
-       #include "../../server/command/sv_cmd.qh"
-       #include "../../common/turrets/config.qh"
-       #include "../../common/weapons/config.qh"
+       #include <server/command/banning.qh>
+       #include <server/command/cmd.qh>
+       #include <server/command/common.qh>
+       #include <server/command/sv_cmd.qh>
+       #include <common/turrets/config.qh>
+       #include <common/weapons/config.qh>
 #endif
 
 // =========================================================

diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc
index 994ea574733716d0590932a50120c6cc0428886c..f68bf383df8d71ec88fd6d97a6a969bbf9f87ebd 100644 (file)
--- a/qcsrc/common/effects/qc/casings.qc
+++ b/qcsrc/common/effects/qc/casings.qc
@@ -1,9 +1,9 @@
 #ifdef IMPLEMENTATION
 
-#include "../../util.qh"
+#include <common/util.qh>
 
 #ifdef CSQC
-#include "../../physics/movetypes/movetypes.qh"
+#include <common/physics/movetypes/movetypes.qh>
 #include "rubble.qh"
 #endif
 

diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc
index 0a8efb3b33fe3c8a6dc6e51be899a00e71b40439..45b532b8a6e15637b22a28e49ece2ab0571f4c04 100644 (file)
--- a/qcsrc/common/effects/qc/damageeffects.qc
+++ b/qcsrc/common/effects/qc/damageeffects.qc
@@ -2,11 +2,11 @@
 #define DAMAGEEFFECTS_H
 
 #ifdef CSQC
-#include "../../deathtypes/all.qh"
-#include "../../physics/movetypes/movetypes.qh"
-#include "../../../client/mutators/events.qh"
-#include "../../vehicles/all.qh"
-#include "../../weapons/all.qh"
+#include <common/deathtypes/all.qh>
+#include <common/physics/movetypes/movetypes.qh>
+#include <client/mutators/events.qh>
+#include <common/vehicles/all.qh>
+#include <common/weapons/all.qh>
 #endif
 
 #endif

diff --git a/qcsrc/common/effects/qc/gibs.qc b/qcsrc/common/effects/qc/gibs.qc
index 2e01a507fa258ae11a2a9da65261a05dfc5bade9..09be41c6af01c637b36c85299a7c37ec612780ff 100644 (file)
--- a/qcsrc/common/effects/qc/gibs.qc
+++ b/qcsrc/common/effects/qc/gibs.qc
@@ -59,7 +59,7 @@ void Violence_GibSplash(entity source, float type, float amount, entity attacker
 .bool silent;
 
 #include "rubble.qh"
-#include "../../physics/movetypes/movetypes.qh"
+#include <common/physics/movetypes/movetypes.qh>
 
 .float scale;
 .float alpha;

diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc
index 7f77d84004d739e8b8bfeb10f2d4eebee3d63468..d5324ca6fa04aadc08d4b51d18c3b3ae7dae4e97 100644 (file)
--- a/qcsrc/common/effects/qc/globalsound.qc
+++ b/qcsrc/common/effects/qc/globalsound.qc
@@ -1,12 +1,12 @@
 #include "globalsound.qh"
 
-#include "../../ent_cs.qh"
+#include <common/ent_cs.qh>
 
 #ifdef IMPLEMENTATION
-       #include "../../animdecide.qh"
+       #include <common/animdecide.qh>
 
        #ifdef SVQC
-               #include "../../../server/cl_player.qh"
+               #include <server/cl_player.qh>
        #endif
 
        REGISTER_NET_TEMP(globalsound)

diff --git a/qcsrc/common/items/item/ammo.qc b/qcsrc/common/items/item/ammo.qc
index c1f0012beeba1f25215051d413b6e2b2c2ab7ad7..525a5b3d930a14d07fb47ca546a1dd41b94ef7d0 100644 (file)
--- a/qcsrc/common/items/item/ammo.qc
+++ b/qcsrc/common/items/item/ammo.qc
@@ -1,6 +1,6 @@
 #include "ammo.qh"
 #ifdef SVQC
-    #include "../../t_items.qh"
+    #include <common/t_items.qh>
 #endif
 
 #ifndef MENUQC

diff --git a/qcsrc/common/items/item/armor.qc b/qcsrc/common/items/item/armor.qc
index 277cc86147a90bb426e36cf99cf48b6dc32c9428..f8669e0e08503baa95529bef70f2424944ceb159 100644 (file)
--- a/qcsrc/common/items/item/armor.qc
+++ b/qcsrc/common/items/item/armor.qc
@@ -1,6 +1,6 @@
 #include "armor.qh"
 #ifdef SVQC
-    #include "../../t_items.qh"
+    #include <common/t_items.qh>
 #endif
 
 #ifndef MENUQC

diff --git a/qcsrc/common/items/item/health.qc b/qcsrc/common/items/item/health.qc
index ce9b8760bc197577027095f771a625dcdc374489..93ba2f36e2ab1669bd3b707db541b9a85eac0bd3 100644 (file)
--- a/qcsrc/common/items/item/health.qc
+++ b/qcsrc/common/items/item/health.qc
@@ -1,6 +1,6 @@
 #include "health.qh"
 #ifdef SVQC
-    #include "../../t_items.qh"
+    #include <common/t_items.qh>
 #endif
 
 #ifndef MENUQC

diff --git a/qcsrc/common/items/item/jetpack.qc b/qcsrc/common/items/item/jetpack.qc
index 256069790179acce898b0be09bcc9f078cc32c64..006a36308f347c396388c08b453fe8269f1cb90a 100644 (file)
--- a/qcsrc/common/items/item/jetpack.qc
+++ b/qcsrc/common/items/item/jetpack.qc
@@ -1,6 +1,6 @@
 #ifdef SVQC
-    #include "../../t_items.qh"
-    #include "../../../server/constants.qh"
+    #include <common/t_items.qh>
+    #include <server/constants.qh>
 #endif
 
 #include "ammo.qh"

diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh
index f443ab0af2a3e8887cf72128cdbbfc54cb0df4e9..fd477354f1709db2f03199820a5dbcc5b2b2a8ff 100644 (file)
--- a/qcsrc/common/items/item/powerup.qh
+++ b/qcsrc/common/items/item/powerup.qh
@@ -1,6 +1,6 @@
 #ifdef SVQC
     // For FL_POWERUP
-    #include "../../../server/constants.qh"
+    #include <server/constants.qh>
 #endif
 
 #ifndef POWERUP_H

diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh
index b8781cbf95651393dbd5da8c92dcb852f9bb5302..476dcfbe216e0ed73bc3f0ce9c13d1d931b09618 100644 (file)
--- a/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@ -3,13 +3,13 @@
 
 #ifdef SVQC
 #include "sv_monsters.qh"
-#include "../../server/g_damage.qh"
-#include "../../server/bot/bot.qh"
-#include "../../server/weapons/common.qh"
-#include "../../server/weapons/tracing.qh"
-#include "../../server/weapons/weaponsystem.qh"
-#include "../mutators/mutator/waypoints/waypointsprites.qh"
-#include "../../lib/warpzone/server.qh"
+#include <server/g_damage.qh>
+#include <server/bot/bot.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/tracing.qh>
+#include <server/weapons/weaponsystem.qh>
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
+#include <lib/warpzone/server.qh>
 #endif
 
 // special spawn flags

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index 38b34c425e6d4e254fe5fb1c3f2cabb819c06351..ac5dd514cf442df613ba46e98397e0c5fbba74bf 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -22,8 +22,8 @@ REGISTER_MONSTER(MAGE, NEW(Mage)) {
 #endif
 }
 
-#include "../../weapons/all.qh"
-#include "../../items/all.qc"
+#include <common/weapons/all.qh>
+#include <common/items/all.qc>
 
 CLASS(MageSpike, PortoLaunch)
 /* flags     */ ATTRIB(MageSpike, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);

diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc
index a2a42ef99abefa48f01b21bb55c08efe492909d1..c642cb5fa46e6fccd45356f497a91177f7d5fa19 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -82,7 +82,7 @@ void M_Shambler_Attack_Swing()
        }
 }
 
-#include "../../effects/qc/all.qh"
+#include <common/effects/qc/all.qh>
 
 void M_Shambler_Attack_Lightning_Explode()
 {SELFPARAM();

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index a25a89e7dde125194dedfe8124412ed8bc2edc20..8dff94a6ada6cb0171faab9be8e23181f359c5b4 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -22,7 +22,7 @@ REGISTER_MONSTER(SPIDER, NEW(Spider)) {
 #endif
 }
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 CLASS(SpiderAttack, PortoLaunch)
 /* flags     */ ATTRIB(SpiderAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);

diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc
index b55c5a42d96eee4f0e3d8501f2369f7face4084e..4fde5311d823d2afe81725016edf2978c57b9b07 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qc
+++ b/qcsrc/common/monsters/monster/wyvern.qc
@@ -22,7 +22,7 @@ REGISTER_MONSTER(WYVERN, NEW(Wyvern)) {
 #endif
 }
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 CLASS(WyvernAttack, PortoLaunch)
 /* flags     */ ATTRIB(WyvernAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);

diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc
index f7e2e292fbf669f6fed88a2e5677288c4af04fbc..e2e573d654d901ca3b680f93395a1cf394e5e4a6 100644 (file)
--- a/qcsrc/common/monsters/spawn.qc
+++ b/qcsrc/common/monsters/spawn.qc
@@ -5,8 +5,8 @@
     #include "all.qh"
     #include "sv_monsters.qh"
     #include "spawn.qh"
-    #include "../../server/autocvars.qh"
-    #include "../../server/defs.qh"
+    #include <server/autocvars.qh>
+    #include <server/defs.qh>
 #endif
 entity spawnmonster (string monster, float monster_id, entity spawnedby, entity own, vector orig, float respwn, float invincible, float moveflag)
 {SELFPARAM();

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index fc5d46c68f99f58e9878a381d78feeec2d95a2bf..9a934ba748c0f471a54f8cab279903126687f499 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1,7 +1,7 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../lib/warpzone/common.qh"
+    #include <lib/warpzone/common.qh>
     #include "../constants.qh"
     #include "../teams.qh"
     #include "../util.qh"
@@ -9,20 +9,20 @@
     #include "sv_monsters.qh"
        #include "../physics/movelib.qh"
     #include "../weapons/all.qh"
-    #include "../../server/autocvars.qh"
-    #include "../../server/defs.qh"
+    #include <server/autocvars.qh>
+    #include <server/defs.qh>
     #include "../deathtypes/all.qh"
-    #include "../../server/mutators/all.qh"
-       #include "../../server/steerlib.qh"
+    #include <server/mutators/all.qh>
+       #include <server/steerlib.qh>
        #include "../turrets/sv_turrets.qh"
        #include "../turrets/util.qh"
     #include "../vehicles/all.qh"
-    #include "../../server/campaign.qh"
-    #include "../../server/command/common.qh"
-    #include "../../server/command/cmd.qh"
+    #include <server/campaign.qh>
+    #include <server/command/common.qh>
+    #include <server/command/cmd.qh>
        #include "../triggers/triggers.qh"
-    #include "../../lib/csqcmodel/sv_model.qh"
-    #include "../../server/round_handler.qh"
+    #include <lib/csqcmodel/sv_model.qh>
+    #include <server/round_handler.qh>
 #endif
 
 void monsters_setstatus()

diff --git a/qcsrc/common/mutators/mutator/breakablehook/breakablehook.qc b/qcsrc/common/mutators/mutator/breakablehook/breakablehook.qc
index 3ee077c723257428da29f395ad4d62aaf3ccecc3..3719001a40f9869647fb02946b08c8f962d333d0 100644 (file)
--- a/qcsrc/common/mutators/mutator/breakablehook/breakablehook.qc
+++ b/qcsrc/common/mutators/mutator/breakablehook/breakablehook.qc
@@ -1,6 +1,6 @@
 #ifdef IMPLEMENTATION
-#include "../../../deathtypes/all.qh"
-#include "../../../../server/g_hook.qh"
+#include <common/deathtypes/all.qh>
+#include <server/g_hook.qh>
 
 REGISTER_MUTATOR(breakablehook, cvar("g_breakablehook"));
 

diff --git a/qcsrc/common/mutators/mutator/buffs/all.qh b/qcsrc/common/mutators/mutator/buffs/all.qh
index 76ecff8be1bac913082922b65dc297de6d4ba10b..d34d32d071ef10f42c1d9f26ec12d6e8ff4a130e 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/all.qh
+++ b/qcsrc/common/mutators/mutator/buffs/all.qh
@@ -5,8 +5,8 @@
 // Add new buffs here!
 // Note: Buffs also need spawnfuncs, which are set below
 
-#include "../../../teams.qh"
-#include "../../../util.qh"
+#include <common/teams.qh>
+#include <common/util.qh>
 
 REGISTER_WAYPOINT(Buff, _("Buff"), '1 0.5 0', 1);
 REGISTER_RADARICON(Buff, 1);
@@ -25,7 +25,7 @@ REGISTRY_CHECK(Buffs)
     } \
     REGISTER_INIT(BUFF_##id)
 
-#include "../../../items/item/pickup.qh"
+#include <common/items/item/pickup.qh>
 CLASS(Buff, Pickup)
        /** bit index */
        ATTRIB(Buff, m_itemid, int, 0)

diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qc b/qcsrc/common/mutators/mutator/buffs/buffs.qc
index 27c039982df57e56f36303c5442a8dd4ec3f8543..2c6bcfb41cd169fb07bbcdaa46aaa018e5e22c78 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qc
@@ -73,8 +73,8 @@ const vector BUFF_MAX = ('16 16 20');
 
 #ifdef IMPLEMENTATION
 
-#include "../../../triggers/target/music.qh"
-#include "../../../gamemodes/all.qh"
+#include <common/triggers/target/music.qh>
+#include <common/gamemodes/all.qh>
 
 .float buff_time = _STAT(BUFF_TIME);
 void buffs_DelayedInit();

diff --git a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
index 887dcbf950708d0c91e84fd2de5a6ba0e3e9172e..796b3d3955c4cd02296117f31fcc65944908accc 100644 (file)
--- a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
+++ b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
@@ -1,8 +1,8 @@
 #ifdef IMPLEMENTATION
 #ifdef SVQC
-       #include "../../../../server/antilag.qh"
+       #include <server/antilag.qh>
 #endif
-#include "../../../physics/player.qh"
+#include <common/physics/player.qh>
 
 
 #if defined(SVQC)

diff --git a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
index e8f3a54bfb5e1cc69fad9f88777d1b2ca706d855..a6110b01a21e492870dc74c0761d2f8693affec5 100644 (file)
--- a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
+++ b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
@@ -2,7 +2,7 @@
 #define MUTATOR_DAMAGETEXT_H
 
 #ifdef MENUQC
-#include "../../../../menu/xonotic/tab.qc"
+#include <menu/xonotic/tab.qc>
 #endif
 
 #endif
@@ -134,7 +134,7 @@ NET_HANDLE(damagetext, bool isNew)
 
 #ifdef MENUQC
 CLASS(XonoticDamageTextSettings, XonoticTab)
-    #include "../../../../menu/gamesettings.qh"
+    #include <menu/gamesettings.qh>
     REGISTER_SETTINGS(damagetext, NEW(XonoticDamageTextSettings));
     ATTRIB(XonoticDamageTextSettings, title, string, _("Damage text"))
     ATTRIB(XonoticDamageTextSettings, intendedWidth, float, 0.9)

diff --git a/qcsrc/common/mutators/mutator/dodging/dodging.qc b/qcsrc/common/mutators/mutator/dodging/dodging.qc
index 053cdd739f0ab165524524335cefdb5961b4872b..7be7d6939dc48d0d2fa873707a49f2b31190e16f 100644 (file)
--- a/qcsrc/common/mutators/mutator/dodging/dodging.qc
+++ b/qcsrc/common/mutators/mutator/dodging/dodging.qc
@@ -32,8 +32,8 @@ bool autocvar_sv_dodging_sound;
 // the jump part of the dodge cannot be ramped
 .float dodging_single_action;
 
-#include "../../../animdecide.qh"
-#include "../../../physics/player.qh"
+#include <common/animdecide.qh>
+#include <common/physics/player.qh>
 
 .float cvar_cl_dodging_timeout = _STAT(DODGING_TIMEOUT);
 

diff --git a/qcsrc/common/mutators/mutator/doublejump/doublejump.qc b/qcsrc/common/mutators/mutator/doublejump/doublejump.qc
index a72644d9c7731aac591b09282a211fd8ab1c1ead..cb89f32b01254e647be4de4e9ee20e6ff6d05170 100644 (file)
--- a/qcsrc/common/mutators/mutator/doublejump/doublejump.qc
+++ b/qcsrc/common/mutators/mutator/doublejump/doublejump.qc
@@ -1,8 +1,8 @@
 #ifdef IMPLEMENTATION
 #ifdef SVQC
-       #include "../../../../server/antilag.qh"
+       #include <server/antilag.qh>
 #endif
-#include "../../../physics/player.qh"
+#include <common/physics/player.qh>
 
 #ifdef SVQC
 REGISTER_MUTATOR(doublejump, autocvar_sv_doublejump);

diff --git a/qcsrc/common/mutators/mutator/instagib/instagib.qc b/qcsrc/common/mutators/mutator/instagib/instagib.qc
index 2db40680777ab2d22bc936f7badc7d49629af60b..947fcec122db584953dbaca3a28e2006a4918a9d 100644 (file)
--- a/qcsrc/common/mutators/mutator/instagib/instagib.qc
+++ b/qcsrc/common/mutators/mutator/instagib/instagib.qc
@@ -16,9 +16,9 @@ int autocvar_g_instagib_ammo_drop;
 int autocvar_g_instagib_extralives;
 float autocvar_g_instagib_speed_highspeed;
 
-#include "../../../../server/cl_client.qh"
+#include <server/cl_client.qh>
 
-#include "../../../items/all.qc"
+#include <common/items/all.qc>
 
 REGISTER_MUTATOR(mutator_instagib, cvar("g_instagib") && !g_nexball);
 

diff --git a/qcsrc/common/mutators/mutator/instagib/items.qc b/qcsrc/common/mutators/mutator/instagib/items.qc
index a069e535f414559a5967677fcd67b13eacba91c5..46bda6b69b23d4d240d5538285724542e6cdd62e 100644 (file)
--- a/qcsrc/common/mutators/mutator/instagib/items.qc
+++ b/qcsrc/common/mutators/mutator/instagib/items.qc
@@ -1,6 +1,6 @@
-#include "../../../items/all.qh"
-#include "../../../items/item/ammo.qh"
-#include "../../../items/item/powerup.qh"
+#include <common/items/all.qh>
+#include <common/items/item/ammo.qh>
+#include <common/items/item/powerup.qh>
 
 float instagib_respawntime_ammo = 45;
 float instagib_respawntimejitter_ammo = 0;

diff --git a/qcsrc/common/mutators/mutator/multijump/multijump.qc b/qcsrc/common/mutators/mutator/multijump/multijump.qc
index eb5e64a40729138eb30811d9d85bebab6a800b39..43be345c1e41f23d2a1e74583212cd1ef6dbd362 100644 (file)
--- a/qcsrc/common/mutators/mutator/multijump/multijump.qc
+++ b/qcsrc/common/mutators/mutator/multijump/multijump.qc
@@ -1,8 +1,8 @@
 #ifdef IMPLEMENTATION
 #ifdef SVQC
-       #include "../../../../server/antilag.qh"
+       #include <server/antilag.qh>
 #endif
-#include "../../../physics/player.qh"
+#include <common/physics/player.qh>
 
 
 #if defined(SVQC)

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 4b65abc55675319c966d3df4419be11b0f6867a7..cfac98232ad37047ad4676309d801c142835b53b 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -119,10 +119,10 @@ void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expan
 
 #ifdef SVQC
 
-#include "../../../gamemodes/all.qh"
-#include "../../../monsters/spawn.qh"
-#include "../../../monsters/sv_monsters.qh"
-#include "../../../../server/g_subs.qh"
+#include <common/gamemodes/all.qh>
+#include <common/monsters/spawn.qh>
+#include <common/monsters/sv_monsters.qh>
+#include <server/g_subs.qh>
 
 REGISTER_MUTATOR(nades, cvar("g_nades"));
 

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qh b/qcsrc/common/mutators/mutator/nades/nades.qh
index 312cf4ae2dd606e1013890c552db826f261b1b1c..da80327bb24a9ebf31ea5c241e8e5c7483e5c11c 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qh
+++ b/qcsrc/common/mutators/mutator/nades/nades.qh
@@ -1,7 +1,7 @@
 #ifndef NADES_ALL_H
 #define NADES_ALL_H
 
-#include "../../../teams.qh"
+#include <common/teams.qh>
 
 // use slots 70-100
 const int PROJECTILE_NADE = 71;

diff --git a/qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc b/qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc
index 6ddd6db94ce292e5c3ddb8f49110598f381b07a5..eee3fef02f4fec1f8add5d8467c691aae671f632 100644 (file)
--- a/qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc
+++ b/qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc
@@ -1,6 +1,6 @@
 #ifdef IMPLEMENTATION
-#include "../../../deathtypes/all.qh"
-#include "../../../../server/round_handler.qh"
+#include <common/deathtypes/all.qh>
+#include <server/round_handler.qh>
 
 REGISTER_MUTATOR(rm, cvar("g_instagib"));
 

diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc
index bf1cb52e27508831c0d0d707a08277c0992ff71e..ef9f059814c4632f277ab247bb0d65458c21bfc4 100644 (file)
--- a/qcsrc/common/physics/movetypes/movetypes.qc
+++ b/qcsrc/common/physics/movetypes/movetypes.qc
@@ -1,15 +1,15 @@
 #include "../player.qh"
 
 #if defined(CSQC)
-       #include "../../../client/defs.qh"
-       #include "../../stats.qh"
-       #include "../../util.qh"
+       #include <client/defs.qh>
+       #include <common/stats.qh>
+       #include <common/util.qh>
        #include "movetypes.qh"
-       #include "../../../lib/csqcmodel/common.qh"
-       #include "../../t_items.qh"
+       #include <lib/csqcmodel/common.qh>
+       #include <common/t_items.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../../server/autocvars.qh"
+       #include <server/autocvars.qh>
 #endif
 
 void _Movetype_WallFriction(entity this, vector stepnormal)  // SV_WallFriction

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 44614c1bd3f0e2d2ee3bb7272cdcf670277204fb..6cc47ea63a4dd37df944a492e4f2ed0f243dc1ae 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -4,7 +4,7 @@
 
 #ifdef SVQC
 
-#include "../../server/miscfunctions.qh"
+#include <server/miscfunctions.qh>
 #include "../triggers/trigger/viewloc.qh"
 
 // client side physics

diff --git a/qcsrc/common/triggers/func/breakable.qc b/qcsrc/common/triggers/func/breakable.qc
index 7f17de515e59b733379973348af49f48bad141f2..e43e0e4c4137864024b9640e7de0d32cfccc28b3 100644 (file)
--- a/qcsrc/common/triggers/func/breakable.qc
+++ b/qcsrc/common/triggers/func/breakable.qc
@@ -1,11 +1,11 @@
 #ifdef SVQC
 
-#include "../../../server/g_subs.qh"
-#include "../../../server/g_damage.qh"
-#include "../../../server/bot/bot.qh"
-#include "../../../common/csqcmodel_settings.qh"
-#include "../../../lib/csqcmodel/sv_model.qh"
-#include "../../../server/weapons/common.qh"
+#include <server/g_subs.qh>
+#include <server/g_damage.qh>
+#include <server/bot/bot.qh>
+#include <common/csqcmodel_settings.qh>
+#include <lib/csqcmodel/sv_model.qh>
+#include <server/weapons/common.qh>
 
 .entity sprite;
 

diff --git a/qcsrc/common/triggers/include.qh b/qcsrc/common/triggers/include.qh
index f69a72b0a2bb0c48a4fe5c1d71ad126e6de47507..25688e3ecb692e7114c6ec739d5dbf83236d7aa9 100644 (file)
--- a/qcsrc/common/triggers/include.qh
+++ b/qcsrc/common/triggers/include.qh
@@ -3,7 +3,7 @@
 
 // some required common stuff
 #ifdef CSQC
-       #include "../../server/item_key.qh"
+       #include <server/item_key.qh>
 #endif
 #include "triggers.qh"
 #include "subs.qh"

diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc
index 89c659530b607bef5c7b9c4316f64b9c045da995..11b5807f65ba0c1a688343a60611d0cdbcd83595 100644 (file)
--- a/qcsrc/common/triggers/misc/laser.qc
+++ b/qcsrc/common/triggers/misc/laser.qc
@@ -1,7 +1,7 @@
 #if defined(CSQC)
-       #include "../../../lib/csqcmodel/interpolate.qh"
-       #include "../../../client/main.qh"
-       #include "../../../lib/csqcmodel/cl_model.qh"
+       #include <lib/csqcmodel/interpolate.qh>
+       #include <client/main.qh>
+       #include <lib/csqcmodel/cl_model.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
 #endif

diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc
index e6f68e68b1f30c585f215ad3fe95aecfc461edf2..015ad9138f32887f8aefc76bd646be06f966e409 100644 (file)
--- a/qcsrc/common/triggers/target/music.qc
+++ b/qcsrc/common/triggers/target/music.qc
@@ -1,9 +1,9 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../constants.qh"
-    #include "../../../server/constants.qh"
-    #include "../../../server/defs.qh"
+    #include <common/constants.qh>
+    #include <server/constants.qh>
+    #include <server/defs.qh>
 #endif
 
 REGISTER_NET_TEMP(TE_CSQC_TARGET_MUSIC)

diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/triggers/target/spawn.qc
index 9a1bc40e6aa461a88702df66f2607153854e8c46..96c266f6cc57315e2436e3f752321b83405a5ab8 100644 (file)
--- a/qcsrc/common/triggers/target/spawn.qc
+++ b/qcsrc/common/triggers/target/spawn.qc
@@ -1,8 +1,8 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../util.qh"
-    #include "../../../server/defs.qh"
+    #include <common/util.qh>
+    #include <server/defs.qh>
 #endif
 
 #ifdef SVQC

diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc
index e7d3c5fd70edf3b4e3a7efb804ed4b900b1ec302..37ab1f694e97ba314a52906872686a3cd022a557 100644 (file)
--- a/qcsrc/common/triggers/teleporters.qc
+++ b/qcsrc/common/triggers/teleporters.qc
@@ -3,21 +3,21 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../lib/warpzone/common.qh"
-    #include "../../lib/warpzone/util_server.qh"
-    #include "../../lib/warpzone/server.qh"
+    #include <lib/warpzone/common.qh>
+    #include <lib/warpzone/util_server.qh>
+    #include <lib/warpzone/server.qh>
     #include "../constants.qh"
        #include "../triggers/subs.qh"
     #include "../util.qh"
-    #include "../../server/weapons/csqcprojectile.qh"
-    #include "../../server/autocvars.qh"
-    #include "../../server/constants.qh"
-    #include "../../server/defs.qh"
+    #include <server/weapons/csqcprojectile.qh>
+    #include <server/autocvars.qh>
+    #include <server/constants.qh>
+    #include <server/defs.qh>
     #include "../deathtypes/all.qh"
     #include "../turrets/sv_turrets.qh"
     #include "../vehicles/all.qh"
     #include "../mapinfo.qh"
-    #include "../../server/anticheat.qh"
+    #include <server/anticheat.qh>
 #endif
 
 float check_tdeath(entity player, vector org, vector telefragmin, vector telefragmax)

diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index 23bfcb2451ebd4086a0739e19e973c7aa97a3ee1..10d422fd6426ea361d3a65d15bf6d5cf59b1add9 100644 (file)
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -1,7 +1,7 @@
 // TODO: split target_push and put it in the target folder
 #ifdef SVQC
 #include "jumppads.qh"
-#include "../../physics/movetypes/movetypes.qh"
+#include <common/physics/movetypes/movetypes.qh>
 
 void trigger_push_use()
 {SELFPARAM();

diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/triggers/trigger/secret.qc
index 285ba62a937567c807b57d60f5362ececfcd85c1..9be241e7f49e2c0b56b8ca50740334abb24b5ed2 100644 (file)
--- a/qcsrc/common/triggers/trigger/secret.qc
+++ b/qcsrc/common/triggers/trigger/secret.qc
@@ -1,8 +1,8 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../util.qh"
-    #include "../../../server/defs.qh"
+    #include <common/util.qh>
+    #include <server/defs.qh>
     #include "secret.qh"
 #endif
 

diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc
index 2a03db78da3dc507bb8602a11d36f0ed319276d2..89aa02fe46cab5d4dadb9225019a9af75168b405 100644 (file)
--- a/qcsrc/common/triggers/trigger/swamp.qc
+++ b/qcsrc/common/triggers/trigger/swamp.qc
@@ -1,10 +1,10 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../../lib/warpzone/util_server.qh"
-    #include "../../weapons/all.qh"
-    #include "../../../server/defs.qh"
-    #include "../../deathtypes/all.qh"
+    #include <lib/warpzone/util_server.qh>
+    #include <common/weapons/all.qh>
+    #include <server/defs.qh>
+    #include <common/deathtypes/all.qh>
 #endif
 
 /*

diff --git a/qcsrc/common/triggers/trigger/viewloc.qc b/qcsrc/common/triggers/trigger/viewloc.qc
index af67533a831fe4622afc39a7b519b369a92917cb..a6d9418b3b84e8c05e58b9cc9a0cb56639f81609 100644 (file)
--- a/qcsrc/common/triggers/trigger/viewloc.qc
+++ b/qcsrc/common/triggers/trigger/viewloc.qc
@@ -1,8 +1,8 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../../lib/warpzone/util_server.qh"
-    #include "../../../server/defs.qh"
+    #include <lib/warpzone/util_server.qh>
+    #include <server/defs.qh>
 #endif
 
 REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC)

diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc
index fbe2eb9e6668ecfaf49303a578d11e917201f449..fc10451d3970bb25cb04e205c4496c5771a96a08 100644 (file)
--- a/qcsrc/common/turrets/sv_turrets.qc
+++ b/qcsrc/common/turrets/sv_turrets.qc
@@ -1,5 +1,5 @@
 #ifdef SVQC
-#include "../../server/autocvars.qh"
+#include <server/autocvars.qh>
 
 // Generic aiming
 vector turret_aim_generic()

diff --git a/qcsrc/common/turrets/turret/walker.qc b/qcsrc/common/turrets/turret/walker.qc
index a7ec5d76dd8724621f728f7a008ec66e7ed3e2d6..c541f9131c88a91ff106be6a59d16b45bd024f75 100644 (file)
--- a/qcsrc/common/turrets/turret/walker.qc
+++ b/qcsrc/common/turrets/turret/walker.qc
@@ -630,7 +630,7 @@ spawnfunc(turret_walker) { if(!turret_initialize(TUR_WALKER)) remove(self); }
 #endif // SVQC
 #ifdef CSQC
 
-#include "../../physics/movelib.qh"
+#include <common/physics/movelib.qh>
 
 void walker_draw(entity this)
 {

diff --git a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
index 11ee8ebc7eed104bcc529b5b09e89794cf936f9c..0d0dfb0d135065e25d59b8a8f0fe642ca5afa179 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
+++ b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
@@ -1,7 +1,7 @@
 #ifndef VEHICLE_BUMBLEBEE_WEAPONS_H
 #define VEHICLE_BUMBLEBEE_WEAPONS_H
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 #endif
 

diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc
index 22c3f1e021ad1164ec1522fb02ab14e16405168c..da89dc0aa94fb75cb95dc4d9fe7472320b65e17b 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/racer.qc
+++ b/qcsrc/common/vehicles/vehicle/racer.qc
@@ -27,7 +27,7 @@ REGISTER_VEHICLE(RACER, NEW(Racer));
 #include "racer_weapon.qc"
 
 #ifdef SVQC
-#include "../../triggers/trigger/impulse.qh"
+#include <common/triggers/trigger/impulse.qh>
 
 bool autocvar_g_vehicle_racer;
 

diff --git a/qcsrc/common/vehicles/vehicle/racer_weapon.qc b/qcsrc/common/vehicles/vehicle/racer_weapon.qc
index 21f4313c6337a716d37b8a09caa7b3a1c4ca704a..678f9af0b6b69457ef18a17af60002f5cc1936bf 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/racer_weapon.qc
+++ b/qcsrc/common/vehicles/vehicle/racer_weapon.qc
@@ -1,7 +1,7 @@
 #ifndef VEHICLE_RACER_WEAPON_H
 #define VEHICLE_RACER_WEAPON_H
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 CLASS(RacerAttack, PortoLaunch)
 /* flags     */ ATTRIB(RacerAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);

diff --git a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc
index f68b0718884c0ef5954853cfd8f6d9885cac6b72..9af91bf51f871934aa52cdcaa4aa1b937580902a 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc
+++ b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc
@@ -1,7 +1,7 @@
 #ifndef VEHICLE_RAPTOR_WEAPONS_H
 #define VEHICLE_RAPTOR_WEAPONS_H
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 CLASS(RaptorCannon, PortoLaunch)
 /* flags     */ ATTRIB(RaptorCannon, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);

diff --git a/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc b/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc
index bccd8b0ae2634dad0e18990ec26878cd35f98ba3..12007fc39ab6cf73491e24842dadfa8caf881289 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc
+++ b/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc
@@ -1,7 +1,7 @@
 #ifndef VEHICLE_SPIDERBOT_WEAPONS_H
 #define VEHICLE_SPIDERBOT_WEAPONS_H
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 #endif
 

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 78c9c923d7b906260882bf915483c5b71c783839..d531b8c3f29759f1c8a9c77e922c0199dc96c26c 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -4,45 +4,45 @@
 #include "all.qh"
 
 #if defined(CSQC)
-       #include "../../client/defs.qh"
+       #include <client/defs.qh>
        #include "../constants.qh"
        #include "../stats.qh"
-       #include "../../lib/warpzone/anglestransform.qh"
-       #include "../../lib/warpzone/common.qh"
-       #include "../../lib/warpzone/client.qh"
+       #include <lib/warpzone/anglestransform.qh>
+       #include <lib/warpzone/common.qh>
+       #include <lib/warpzone/client.qh>
        #include "../util.qh"
-       #include "../../client/autocvars.qh"
+       #include <client/autocvars.qh>
        #include "../deathtypes/all.qh"
-       #include "../../lib/csqcmodel/interpolate.qh"
+       #include <lib/csqcmodel/interpolate.qh>
        #include "../physics/movetypes/movetypes.qh"
-       #include "../../client/main.qh"
-       #include "../../lib/csqcmodel/cl_model.qh"
+       #include <client/main.qh>
+       #include <lib/csqcmodel/cl_model.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../lib/warpzone/anglestransform.qh"
-    #include "../../lib/warpzone/common.qh"
-    #include "../../lib/warpzone/util_server.qh"
-    #include "../../lib/warpzone/server.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 "../util.qh"
     #include "../monsters/all.qh"
     #include "config.qh"
-    #include "../../server/weapons/csqcprojectile.qh"
-    #include "../../server/weapons/tracing.qh"
+    #include <server/weapons/csqcprojectile.qh>
+    #include <server/weapons/tracing.qh>
     #include "../t_items.qh"
-    #include "../../server/autocvars.qh"
-    #include "../../server/constants.qh"
-    #include "../../server/defs.qh"
+    #include <server/autocvars.qh>
+    #include <server/constants.qh>
+    #include <server/defs.qh>
     #include "../notifications.qh"
     #include "../deathtypes/all.qh"
-    #include "../../server/mutators/all.qh"
+    #include <server/mutators/all.qh>
     #include "../mapinfo.qh"
-    #include "../../server/command/common.qh"
-    #include "../../lib/csqcmodel/sv_model.qh"
-    #include "../../server/portals.qh"
-    #include "../../server/g_hook.qh"
+    #include <server/command/common.qh>
+    #include <lib/csqcmodel/sv_model.qh>
+    #include <server/portals.qh>
+    #include <server/g_hook.qh>
 #endif
 #ifndef MENUQC
        #include "calculations.qc"

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 7a829d5d1bd5eeef0a2a69e7457f2ec7a03ff358..0438d42e0f68e8d7aade94e8f6b65d8c904014cf 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -27,7 +27,7 @@ WepSet ReadWepSet();
 #include "../util.qh"
 
 #ifdef SVQC
-#include "../../server/bot/aim.qh"
+#include <server/bot/aim.qh>
 #endif
 
 REGISTRY(Weapons, 72) // Increase as needed. Can be up to 72.

diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc
index 216a82074f391048f50b2a4cbca05ef51f71b3af..d059746f136b26bc4cadf2f81d8125e198c4ca0e 100644 (file)
--- a/qcsrc/common/weapons/weapon/hook.qc
+++ b/qcsrc/common/weapons/weapon/hook.qc
@@ -319,8 +319,8 @@ void W_Hook_Attack2(Weapon thiswep, entity actor)
 #endif
 
 #ifdef CSQC
-#include "../../../lib/csqcmodel/interpolate.qh"
-#include "../../../lib/warpzone/common.qh"
+#include <lib/csqcmodel/interpolate.qh>
+#include <lib/warpzone/common.qh>
 
 void Draw_CylindricLine(vector from, vector to, float thickness, string texture, float aspect, float shift, vector rgb, float theAlpha, float drawflag, vector vieworg);
 

diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc
index c586e907fa948de4d400f9a34ad965299b09f616..59731c95429d3a816f00b43c9912d128d51ee381 100644 (file)
--- a/qcsrc/common/weapons/weapon/porto.qc
+++ b/qcsrc/common/weapons/weapon/porto.qc
@@ -44,7 +44,7 @@ REGISTER_WEAPON(PORTO, porto, NEW(PortoLaunch));
 #endif
 #ifdef IMPLEMENTATION
 #ifdef SVQC
-#include "../../triggers/trigger/jumppads.qh"
+#include <common/triggers/trigger/jumppads.qh>
 
 spawnfunc(weapon_porto) { weapon_defaultspawnfunc(this, WEP_PORTO); }
 

diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc
index 8b4c58bdd09f29463ce6487bb8125404166828a0..31d70ffe439299563e33dfeca268123775d6526b 100644 (file)
--- a/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@ -13,16 +13,16 @@
 #endif
 
 #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../dpdefs/keycodes.qh"
+       #include <dpdefs/csprogsdefs.qh>
+       #include <dpdefs/keycodes.qh>
 #elif defined(SVQC)
-       #include "../server/sys-pre.qh"
-       #include "../dpdefs/progsdefs.qh"
-       #include "../dpdefs/dpextensions.qh"
-       #include "../server/sys-post.qh"
+       #include <server/sys-pre.qh>
+       #include <dpdefs/progsdefs.qh>
+       #include <dpdefs/dpextensions.qh>
+       #include <server/sys-post.qh>
 #elif defined(MENUQC)
-       #include "../dpdefs/menudefs.qh"
-       #include "../dpdefs/keycodes.qh"
+       #include <dpdefs/menudefs.qh>
+       #include <dpdefs/keycodes.qh>
 #endif
 
 #include "macro.qh"

diff --git a/qcsrc/lib/csqcmodel/cl_model.qc b/qcsrc/lib/csqcmodel/cl_model.qc
index a9e5ac258ef81a722ac5a72ad85932ac079df82f..6903ce07d82ca733b62b746aa1d96f9e52a139b6 100644 (file)
--- a/qcsrc/lib/csqcmodel/cl_model.qc
+++ b/qcsrc/lib/csqcmodel/cl_model.qc
@@ -24,10 +24,10 @@
 #include "cl_player.qh"
 #include "common.qh"
 #include "interpolate.qh"
-#include "../../client/defs.qh"
-#include "../../common/animdecide.qh"
-#include "../../common/csqcmodel_settings.qh"
-#include "../../common/util.qh"
+#include <client/defs.qh>
+#include <common/animdecide.qh>
+#include <common/csqcmodel_settings.qh>
+#include <common/util.qh>
 
 float autocvar_cl_lerpanim_maxdelta_framegroups = 0.1;
 float autocvar_cl_nolerp = 0;

diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc
index 869dcd7706a5e27ccf92327cf39e40bec0361989..88b2f2ec81b2940b87a0a0b0ddd30adab5939197 100644 (file)
--- a/qcsrc/lib/csqcmodel/cl_player.qc
+++ b/qcsrc/lib/csqcmodel/cl_player.qc
@@ -25,14 +25,14 @@
 #include "cl_model.qh"
 #include "common.qh"
 #include "interpolate.qh"
-#include "../../client/defs.qh"
-#include "../../client/main.qh"
-#include "../../common/constants.qh"
-#include "../../common/physics/player.qh"
-#include "../../common/stats.qh"
-#include "../../common/triggers/trigger/viewloc.qh"
-#include "../../common/util.qh"
-#include "../../common/viewloc.qh"
+#include <client/defs.qh>
+#include <client/main.qh>
+#include <common/constants.qh>
+#include <common/physics/player.qh>
+#include <common/stats.qh>
+#include <common/triggers/trigger/viewloc.qh>
+#include <common/util.qh>
+#include <common/viewloc.qh>
 
 float autocvar_cl_movement_errorcompensation = 0;
 

diff --git a/qcsrc/lib/csqcmodel/common.qh b/qcsrc/lib/csqcmodel/common.qh
index c4ec135e8a789b5ae2d7ef505272768c897867fc..a700f3af2b9bda88665508f3456a0bd066c6f613 100644 (file)
--- a/qcsrc/lib/csqcmodel/common.qh
+++ b/qcsrc/lib/csqcmodel/common.qh
@@ -22,7 +22,7 @@
 #ifndef LIB_CSQCMODEL_COMMON_H
 #define LIB_CSQCMODEL_COMMON_H
 
-#include "../../common/csqcmodel_settings.qh"
+#include <common/csqcmodel_settings.qh>
 
 noref string csqcmodel_license = "\
 Copyright (c) 2011 Rudolf Polzer\

diff --git a/qcsrc/lib/csqcmodel/sv_model.qc b/qcsrc/lib/csqcmodel/sv_model.qc
index 207647e0d171af30736e100c76e13d434cb88dab..7f08faf4392f417e61aef40e8de429529116ca7c 100644 (file)
--- a/qcsrc/lib/csqcmodel/sv_model.qc
+++ b/qcsrc/lib/csqcmodel/sv_model.qc
@@ -22,11 +22,11 @@
 #include "sv_model.qh"
 
 #include "common.qh"
-#include "../../common/animdecide.qh"
-#include "../../common/constants.qh"
-#include "../../common/util.qh"
-#include "../../server/constants.qh"
-#include "../../server/defs.qh"
+#include <common/animdecide.qh>
+#include <common/constants.qh>
+#include <common/util.qh>
+#include <server/constants.qh>
+#include <server/defs.qh>
 
 // generic CSQC model code
 

diff --git a/qcsrc/lib/draw.qh b/qcsrc/lib/draw.qh
index 96aa7901b8caf701927d25856b0dd2939907c3e2..c8d9ae8de9b4dedee783b3ac3d4f0e531cef9286 100644 (file)
--- a/qcsrc/lib/draw.qh
+++ b/qcsrc/lib/draw.qh
@@ -5,7 +5,7 @@
        #include "i18n.qh"
        #include "vector.qh"
 
-       #include "../client/defs.qh"
+       #include <client/defs.qh>
 
        void Draw_CylindricLine(vector from, vector to, float thickness, string texture, float aspect, float shift, vector rgb, float theAlpha, float drawflag, vector vieworg)
        {

diff --git a/qcsrc/lib/warpzone/client.qc b/qcsrc/lib/warpzone/client.qc
index e33a72b1ed9830403468e61e27f251cba3708094..a0366922c473951d0c0efa819079f6d3bde2deb7 100644 (file)
--- a/qcsrc/lib/warpzone/client.qc
+++ b/qcsrc/lib/warpzone/client.qc
@@ -2,8 +2,8 @@
 #include "common.qh"
 
 #if defined(CSQC)
-       #include "../../client/autocvars.qh"
-       #include "../csqcmodel/cl_model.qh"
+       #include <client/autocvars.qh>
+       #include <lib/csqcmodel/cl_model.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
 #endif

diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc
index a4240680a4a573c606b78959dae62e61fe938908..080c6310bd0ad342a99b1dbdb69aa04959815d22 100644 (file)
--- a/qcsrc/lib/warpzone/common.qc
+++ b/qcsrc/lib/warpzone/common.qc
@@ -1,10 +1,10 @@
 #include "common.qh"
 
 #if defined(CSQC)
-    #include "../../common/t_items.qh"
+    #include <common/t_items.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../common/weapons/all.qh"
+    #include <common/weapons/all.qh>
 #endif
 
 void WarpZone_Accumulator_Clear(entity acc)

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index b97d58ca0cbe337925bfe7655d8a87c60f862ace..9273750439382a5d2500d4fc8ada072f851304ac 100644 (file)
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -4,12 +4,12 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../common/constants.qh"
-       #include "../../common/triggers/subs.qh"
-       #include "../../common/util.qh"
-       #include "../../server/command/common.qh"
-       #include "../../server/constants.qh"
-       #include "../../server/defs.qh"
+       #include <common/constants.qh>
+       #include <common/triggers/subs.qh>
+       #include <common/util.qh>
+       #include <server/command/common.qh>
+       #include <server/constants.qh>
+       #include <server/defs.qh>
 #endif
 
 #ifdef WARPZONELIB_KEEPDEBUG

diff --git a/qcsrc/lib/warpzone/util_server.qc b/qcsrc/lib/warpzone/util_server.qc
index 742ec3e201d2b9c73419548d1390e30fca3b14b6..92c347a153dbd782b2a4828356f3015405ea8196 100644 (file)
--- a/qcsrc/lib/warpzone/util_server.qc
+++ b/qcsrc/lib/warpzone/util_server.qc
@@ -5,7 +5,7 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../csqcmodel/sv_model.qh"
+    #include <lib/csqcmodel/sv_model.qh>
 #endif
 #include "common.qh"
 

diff --git a/qcsrc/menu/command/all.qc b/qcsrc/menu/command/all.qc
index 711a747ea985646e8388585cfb15cc38ac98233f..a08a1cee154bd56fc344c788c3a205240ab056b7 100644 (file)
--- a/qcsrc/menu/command/all.qc
+++ b/qcsrc/menu/command/all.qc
@@ -1,5 +1,5 @@
 #include "../menu.qh"
 
-#include "../../common/command/all.qc"
+#include <common/command/all.qc>
 
 #include "menu_cmd.qc"

diff --git a/qcsrc/menu/command/all.qh b/qcsrc/menu/command/all.qh
index 7f116ae9f188e92b41d184f7eeaa8d189664541f..f42a64ff07fd0263a4f536c9cf1d3ada8c7fe790 100644 (file)
--- a/qcsrc/menu/command/all.qh
+++ b/qcsrc/menu/command/all.qh
@@ -1,7 +1,7 @@
 #ifndef MENU_COMMANDS_ALL_H
 #define MENU_COMMANDS_ALL_H
 
-#include "../../common/command/commands.qh"
+#include <common/command/commands.qh>
 
 #include "menu_cmd.qh"
 

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index eedb59ecaf2c5a88e94c9b4db36120752a79417b..c76beca04bf34a7c51b847fa627fc215cef25e17 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -5,7 +5,7 @@
 
 #include "../mutators/events.qh"
 
-#include "../../common/command/generic.qh"
+#include <common/command/generic.qh>
 
 .entity firstChild, nextSibling;
 

diff --git a/qcsrc/menu/mutators/events.qh b/qcsrc/menu/mutators/events.qh
index a3dc720e8f0bc5f4ac8c05865a734ec0b66e32d0..2b881992ee6a5177b9585ea12ffdacdec01d1c00 100644 (file)
--- a/qcsrc/menu/mutators/events.qh
+++ b/qcsrc/menu/mutators/events.qh
@@ -1,7 +1,7 @@
 #ifndef MENU_MUTATORS_EVENTS_H
 #define MENU_MUTATORS_EVENTS_H
 
-#include "../../common/mutators/base.qh"
+#include <common/mutators/base.qh>
 
 // globals
 

diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc
index a539d0f6fac7276c75fbbde51d850a8edde35c53..5947c3e7376d112230226a05ab08d35660b3a5b0 100644 (file)
--- a/qcsrc/menu/xonotic/campaign.qc
+++ b/qcsrc/menu/xonotic/campaign.qc
@@ -1,4 +1,4 @@
-#include "../../common/campaign_common.qh"
+#include <common/campaign_common.qh>
 
 #ifndef CAMPAIGN_H
 #define CAMPAIGN_H

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
index e45e9595f0dab1624789b376588320237521f965..a411a8a7f3d45d0a1c50bbfa7562708648d08321 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
@@ -1,4 +1,4 @@
-#include "../../common/weapons/all.qh"
+#include <common/weapons/all.qh>
 
 #ifndef DIALOG_MULTIPLAYER_CREATE_MUTATORS_H
 #define DIALOG_MULTIPLAYER_CREATE_MUTATORS_H

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
index b459728594c650364e0c8fde6ee984e31025f802..798ef3ae78b9f405a7b5842427c627debe44ccef 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
@@ -1,4 +1,4 @@
-#include "../../common/mapinfo.qh"
+#include <common/mapinfo.qh>
 
 #ifndef DIALOG_MULTIPLAYER_JOIN_SERVERINFO_H
 #define DIALOG_MULTIPLAYER_JOIN_SERVERINFO_H

diff --git a/qcsrc/menu/xonotic/statslist.qc b/qcsrc/menu/xonotic/statslist.qc
index 4a6e03f28e91c44314817782c3f0a20f5aa5576c..3a52371d1acd4160d232eb55f26ed9d512ddf593 100644 (file)
--- a/qcsrc/menu/xonotic/statslist.qc
+++ b/qcsrc/menu/xonotic/statslist.qc
@@ -1,4 +1,4 @@
-#include "../../common/playerstats.qh"
+#include <common/playerstats.qh>
 
 #ifndef STATSLIST_H
 #define STATSLIST_H

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index b879257b7f7be8712694155a04ab66cff2c3509c..c2a53db939e341a67afcfdcc4536604bae2ad918 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -3,11 +3,11 @@
 #include "../item.qc"
 
 #include "../menu.qh"
-#include "../../common/campaign_common.qh"
-#include "../../common/constants.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/util.qh"
-#include "../../common/command/generic.qh"
+#include <common/campaign_common.qh>
+#include <common/constants.qh>
+#include <common/mapinfo.qh>
+#include <common/util.qh>
+#include <common/command/generic.qh>
 
 float GL_CheckExtension(string ext)
 {

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index d9beb7c533dc551a3de92d1e3b4bc38b11b88356..825799b282f20640799813ec4063331d392eb12f 100644 (file)
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -17,23 +17,23 @@
 #include "../constants.qh"
 #include "../defs.qh"
 #include "../race.qh"
-#include "../../common/t_items.qh"
+#include <common/t_items.qh>
 
 #include "../mutators/all.qh"
 
 #include "../weapons/accuracy.qh"
 
-#include "../../common/constants.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/teams.qh"
-#include "../../common/util.qh"
+#include <common/constants.qh>
+#include <common/mapinfo.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
 
-#include "../../common/weapons/all.qh"
+#include <common/weapons/all.qh>
 
-#include "../../lib/csqcmodel/sv_model.qh"
+#include <lib/csqcmodel/sv_model.qh>
 
-#include "../../lib/warpzone/common.qh"
-#include "../../lib/warpzone/util_server.qh"
+#include <lib/warpzone/common.qh>
+#include <lib/warpzone/util_server.qh>
 
 entity bot_spawn()
 {SELFPARAM();

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 6371b6916f06953245bd20080912a33f01a50427..ee7d39d17d46086aac8a07dccb96da61e91a7e68 100644 (file)
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -6,12 +6,12 @@
 #include "../scripting.qh"
 #include "../waypoints.qh"
 
-#include "../../../common/constants.qh"
-#include "../../../common/items/all.qh"
+#include <common/constants.qh>
+#include <common/items/all.qh>
 
-#include "../../../common/triggers/trigger/jumppads.qh"
+#include <common/triggers/trigger/jumppads.qh>
 
-#include "../../../lib/warpzone/common.qh"
+#include <lib/warpzone/common.qh>
 
 .float speed;
 

diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc
index 7e8b8b5305b8799c2159e46e4e2b9874aaaf9ea0..937d67d3dd32d162a8bfa44d27fdcf3618be8669 100644 (file)
--- a/qcsrc/server/bot/navigation.qc
+++ b/qcsrc/server/bot/navigation.qc
@@ -3,12 +3,12 @@
 #include "bot.qh"
 #include "waypoints.qh"
 
-#include "../../common/t_items.qh"
+#include <common/t_items.qh>
 
-#include "../../common/items/all.qh"
+#include <common/items/all.qh>
 
-#include "../../common/constants.qh"
-#include "../../common/triggers/trigger/jumppads.qh"
+#include <common/constants.qh>
+#include <common/triggers/trigger/jumppads.qh>
 
 .float speed;
 

diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc
index b4b614967b5a52e47e52a4e5ae8269c6afa99b3f..3f3a54dd390f3cd75d42d7eb1304ff52fb7ff514 100644 (file)
--- a/qcsrc/server/bot/waypoints.qc
+++ b/qcsrc/server/bot/waypoints.qc
@@ -5,10 +5,10 @@
 
 #include "../antilag.qh"
 
-#include "../../common/constants.qh"
+#include <common/constants.qh>
 
-#include "../../lib/warpzone/common.qh"
-#include "../../lib/warpzone/util_server.qh"
+#include <lib/warpzone/common.qh>
+#include <lib/warpzone/util_server.qh>
 
 // create a new spawnfunc_waypoint and automatically link it to other waypoints, and link
 // them back to it as well

diff --git a/qcsrc/server/command/all.qc b/qcsrc/server/command/all.qc
index ac37b6b2ce792649919625757ff1d8ffc00366b7..a15ae46deb4156ac4b89da54a39e77fb55c856e4 100644 (file)
--- a/qcsrc/server/command/all.qc
+++ b/qcsrc/server/command/all.qc
@@ -1,4 +1,4 @@
-#include "../../common/command/all.qc"
+#include <common/command/all.qc>
 
 #include "sv_cmd.qc"
 

diff --git a/qcsrc/server/command/all.qh b/qcsrc/server/command/all.qh
index 2b240fb2aba79227fe6c3b8dbe792ee3af6a1691..0d74ec2739518fe6e487bca835ec0b11a45844bf 100644 (file)
--- a/qcsrc/server/command/all.qh
+++ b/qcsrc/server/command/all.qh
@@ -1,7 +1,7 @@
 #ifndef SERVER_COMMANDS_ALL_H
 #define SERVER_COMMANDS_ALL_H
 
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 REGISTRY(SERVER_COMMANDS, BITS(7))
 #define SERVER_COMMANDS_from(i) _SERVER_COMMANDS_from(i, NULL)
 REGISTER_REGISTRY(SERVER_COMMANDS)

diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc
index 30d6291f646b034dcca0a293474d9f906d82902f..9c7eb00ca637b909a076b562f02a3e9f72b8074d 100644 (file)
--- a/qcsrc/server/command/banning.qc
+++ b/qcsrc/server/command/banning.qc
@@ -1,4 +1,4 @@
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 #include "banning.qh"
 
 #include "common.qh"
@@ -6,7 +6,7 @@
 #include "../cl_player.qh"
 #include "../ipban.qh"
 
-#include "../../common/util.qh"
+#include <common/util.qh>
 
 // =====================================================
 //  Banning and kicking command code, written by Samual

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 4494c104db136b94ebdc2cfb5c3d4763b50601e8..1900989e663f3c0bf50b731bfdf68bb7a87af90b 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -1,4 +1,4 @@
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 #include "cmd.qh"
 
 #include "common.qh"
@@ -15,25 +15,25 @@
 #include "../mutators/all.qh"
 
 #ifdef SVQC
-       #include "../../common/vehicles/all.qh"
+       #include <common/vehicles/all.qh>
 #endif
 
-#include "../../common/constants.qh"
-#include "../../common/deathtypes/all.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/notifications.qh"
-#include "../../common/physics/player.qh"
-#include "../../common/teams.qh"
-#include "../../common/util.qh"
-#include "../../common/triggers/triggers.qh"
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
+#include <common/mapinfo.qh>
+#include <common/notifications.qh>
+#include <common/physics/player.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
+#include <common/triggers/triggers.qh>
 
-#include "../../common/minigames/sv_minigames.qh"
+#include <common/minigames/sv_minigames.qh>
 
-#include "../../common/monsters/all.qc"
-#include "../../common/monsters/spawn.qh"
-#include "../../common/monsters/sv_monsters.qh"
+#include <common/monsters/all.qc>
+#include <common/monsters/spawn.qh>
+#include <common/monsters/sv_monsters.qh>
 
-#include "../../lib/warpzone/common.qh"
+#include <lib/warpzone/common.qh>
 
 void ClientKill_TeamChange(float targetteam);  // 0 = don't change, -1 = auto, -2 = spec
 

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index 8fd5fb047f083d41e7fbf676b53cbaf20931c121..c03b874d1ba17d43115174053d0e839aa8b3638b 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -1,11 +1,11 @@
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 #include "common.qh"
 
 #include "../scores.qh"
 
-#include "../../common/monsters/all.qh"
-#include "../../common/notifications.qh"
-#include "../../lib/warpzone/common.qh"
+#include <common/monsters/all.qh>
+#include <common/notifications.qh>
+#include <lib/warpzone/common.qh>
 
 
 // ====================================================

diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh
index 08b8b848fdd43e7cc1111e025609cc6d334e7648..6aed511e1bc45c898dc8d7db98cbb28ebd1e195e 100644 (file)
--- a/qcsrc/server/command/common.qh
+++ b/qcsrc/server/command/common.qh
@@ -1,7 +1,7 @@
 #ifndef COMMAND_COMMON_H
 #define COMMAND_COMMON_H
 
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 REGISTRY(COMMON_COMMANDS, BITS(7))
 #define COMMON_COMMANDS_from(i) _COMMON_COMMANDS_from(i, NULL)
 REGISTER_REGISTRY(COMMON_COMMANDS)
@@ -20,10 +20,10 @@ STATIC_INIT(COMMON_COMMANDS_aliases) {
 }
 
 #include "vote.qh"
-#include "../../common/monsters/spawn.qh"
+#include <common/monsters/spawn.qh>
 
-#include "../../common/command/generic.qh"
-#include "../../common/command/command.qh"
+#include <common/command/generic.qh>
+#include <common/command/command.qh>
 
 // ============================================================
 //  Shared declarations for server commands, written by Samual

diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc
index d2233029d8eee619902f4dc55175825e687c7783..ea61290e5adc45f2588eddcaa2640a2fafecf5d3 100644 (file)
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -1,13 +1,13 @@
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 #include "getreplies.qh"
 
 #include "../race.qh"
 
-#include "../../common/constants.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/util.qh"
+#include <common/constants.qh>
+#include <common/mapinfo.qh>
+#include <common/util.qh>
 
-#include "../../common/monsters/all.qh"
+#include <common/monsters/all.qh>
 
 // =========================================================
 //  Reply messages for common commands, re-worked by Samual

diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index 7475c5a5463185f617a1913a4ea51959d55bdd29..cec53d4f33baef9a4340457a89c5d90a31802529 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -1,12 +1,12 @@
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 #include "radarmap.qh"
 
 #include "../g_world.qh"
 #include "../g_subs.qh"
 
-#include "../../common/util.qh"
+#include <common/util.qh>
 
-#include "../../lib/csqcmodel/sv_model.qh"
+#include <lib/csqcmodel/sv_model.qh>
 
 // ===============================================
 //     Generates radar map images for use in the HUD

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 13829504a21c0f8b2e666d69b08801a65ea2d3f0..a9ce54e3031249e42b49a97a334ee7e716a0a9c7 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -21,13 +21,13 @@
 
 #include "../mutators/all.qh"
 
-#include "../../common/constants.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/notifications.qh"
-#include "../../common/teams.qh"
-#include "../../common/util.qh"
+#include <common/constants.qh>
+#include <common/mapinfo.qh>
+#include <common/notifications.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
 
-#include "../../common/monsters/sv_monsters.qh"
+#include <common/monsters/sv_monsters.qh>
 
 
 void PutObserverInServer();

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 37d3b78e62e855b46aabbc03e78b343325731fc9..2053d74ea99f7e3026b5a6bac1e406215e44c1dc 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -1,4 +1,4 @@
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 #include "vote.qh"
 
 #include "common.qh"
@@ -11,11 +11,11 @@
 
 #include "../mutators/all.qh"
 
-#include "../../common/constants.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/notifications.qh"
-#include "../../common/playerstats.qh"
-#include "../../common/util.qh"
+#include <common/constants.qh>
+#include <common/mapinfo.qh>
+#include <common/notifications.qh>
+#include <common/playerstats.qh>
+#include <common/util.qh>
 
 // =============================================
 //  Server side voting code, reworked by Samual

diff --git a/qcsrc/server/mutators/all.qc b/qcsrc/server/mutators/all.qc
index 72c41ad47c7949a772e46e2f144adb0cb28dce14..5c6906b7c4a4ac1d9d1609b8f8f31d2d123ba330 100644 (file)
--- a/qcsrc/server/mutators/all.qc
+++ b/qcsrc/server/mutators/all.qc
@@ -1,25 +1,25 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../lib/warpzone/anglestransform.qh"
-    #include "../../lib/warpzone/common.qh"
-    #include "../../lib/warpzone/util_server.qh"
-    #include "../../lib/warpzone/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/command.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/all.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/all.qh"
+    #include <lib/warpzone/anglestransform.qh>
+    #include <lib/warpzone/common.qh>
+    #include <lib/warpzone/util_server.qh>
+    #include <lib/warpzone/server.qh>
+    #include <common/constants.qh>
+    #include <common/stats.qh>
+    #include <common/teams.qh>
+    #include <common/util.qh>
+    #include <common/command/markup.qh>
+    #include <common/command/rpn.qh>
+    #include <common/command/generic.qh>
+    #include <common/command/command.qh>
+    #include <common/net_notice.qh>
+    #include <common/animdecide.qh>
+    #include <common/monsters/all.qh>
+    #include <common/monsters/sv_monsters.qh>
+    #include <common/monsters/spawn.qh>
+    #include <common/weapons/config.qh>
+    #include <common/weapons/all.qh>
     #include "../weapons/accuracy.qh"
     #include "../weapons/common.qh"
     #include "../weapons/csqcprojectile.qh"
@@ -30,18 +30,18 @@
     #include "../weapons/tracing.qh"
     #include "../weapons/weaponstats.qh"
     #include "../weapons/weaponsystem.qh"
-    #include "../../common/t_items.qh"
+    #include <common/t_items.qh>
     #include "../autocvars.qh"
     #include "../constants.qh"
     #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes/all.qh"
+    #include <common/notifications.qh>
+    #include <common/deathtypes/all.qh>
     #include "all.qh"
-    #include "../../common/turrets/sv_turrets.qh"
-    #include "../../common/vehicles/all.qh"
+    #include <common/turrets/sv_turrets.qh>
+    #include <common/vehicles/all.qh>
     #include "../campaign.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/mapinfo.qh"
+    #include <common/campaign_common.qh>
+    #include <common/mapinfo.qh>
     #include "../command/common.qh"
     #include "../command/banning.qh"
     #include "../command/radarmap.qh"
@@ -49,12 +49,12 @@
     #include "../command/getreplies.qh"
     #include "../command/cmd.qh"
     #include "../command/sv_cmd.qh"
-    #include "../../common/csqcmodel_settings.qh"
-    #include "../../lib/csqcmodel/common.qh"
-    #include "../../lib/csqcmodel/sv_model.qh"
+    #include <common/csqcmodel_settings.qh>
+    #include <lib/csqcmodel/common.qh>
+    #include <lib/csqcmodel/sv_model.qh>
     #include "../anticheat.qh"
     #include "../cheats.qh"
-    #include "../../common/playerstats.qh"
+    #include <common/playerstats.qh>
     #include "../portals.qh"
     #include "../g_hook.qh"
     #include "../scores.qh"
@@ -67,7 +67,7 @@
     #include "../round_handler.qh"
     #include "../item_key.qh"
     #include "../pathlib/pathlib.qh"
-    #include "../../common/vehicles/all.qh"
+    #include <common/vehicles/all.qh>
 #endif
 
 #include "all.qh"

diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh
index 75c1872aa2ccc510330e79772964835b80a7e911..bff80c7cec81470bd690e3285c383a6573832afd 100644 (file)
--- a/qcsrc/server/mutators/events.qh
+++ b/qcsrc/server/mutators/events.qh
@@ -1,7 +1,7 @@
 #ifndef SERVER_MUTATORS_EVENTS_H
 #define SERVER_MUTATORS_EVENTS_H
 
-#include "../../common/mutators/base.qh"
+#include <common/mutators/base.qh>
 
 // register all possible hooks here
 

diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh
index 06108be95f3b6d74f94a4de16c7a9bc285a45ac9..5c17e9a1713c88e28d8a130d1583345132b3e490 100644 (file)
--- a/qcsrc/server/mutators/gamemode.qh
+++ b/qcsrc/server/mutators/gamemode.qh
@@ -20,22 +20,22 @@
 
 #include "../command/vote.qh"
 
-#include "../../common/monsters/all.qh"
+#include <common/monsters/all.qh>
 
 #include "../command/common.qh"
 
 #include "../weapons/tracing.qh"
 #include "../weapons/weaponsystem.qh"
 
-#include "../../common/deathtypes/all.qh"
-#include "../../common/notifications.qh"
-#include "../../common/triggers/teleporters.qh"
-#include "../../common/triggers/subs.qh"
-#include "../../common/stats.qh"
-#include "../../common/teams.qh"
+#include <common/deathtypes/all.qh>
+#include <common/notifications.qh>
+#include <common/triggers/teleporters.qh>
+#include <common/triggers/subs.qh>
+#include <common/stats.qh>
+#include <common/teams.qh>
 
-#include "../../lib/warpzone/server.qh"
-#include "../../lib/warpzone/util_server.qh"
+#include <lib/warpzone/server.qh>
+#include <lib/warpzone/util_server.qh>
 
 .float lastground;
 float total_players;

diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh
index f883b84b4baa0a93cfb699f9e1b3a20396b6659b..c29e10eb82071a9a60b5f78492afea99b80461e4 100644 (file)
--- a/qcsrc/server/mutators/mutator.qh
+++ b/qcsrc/server/mutators/mutator.qh
@@ -1,7 +1,7 @@
 #ifndef MUTATOR_H
 #define MUTATOR_H
 
-#include "../../common/mutators/base.qh"
+#include <common/mutators/base.qh>
 
 #include "../cl_client.qh"
 #include "../cl_player.qh"
@@ -27,17 +27,17 @@
 #include "../weapons/throwing.qh"
 #include "../weapons/weaponsystem.qh"
 
-#include "../../common/deathtypes/all.qh"
-#include "../../common/notifications.qh"
-#include "../../common/triggers/teleporters.qh"
-#include "../../common/triggers/subs.qh"
-#include "../../common/stats.qh"
-#include "../../common/teams.qh"
+#include <common/deathtypes/all.qh>
+#include <common/notifications.qh>
+#include <common/triggers/teleporters.qh>
+#include <common/triggers/subs.qh>
+#include <common/stats.qh>
+#include <common/teams.qh>
 
-#include "../../common/monsters/all.qh"
+#include <common/monsters/all.qh>
 
-#include "../../lib/warpzone/anglestransform.qh"
-#include "../../lib/warpzone/server.qh"
-#include "../../lib/warpzone/util_server.qh"
+#include <lib/warpzone/anglestransform.qh>
+#include <lib/warpzone/server.qh>
+#include <lib/warpzone/util_server.qh>
 
 #endif

diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
index 9100c52ba73d9aab6df4587d5c86965f683d9ffb..df72b097e01d501b603d7458227bc4b06a3228ce 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
@@ -208,11 +208,11 @@ const int CTF_SHIELDED                                    = 4096;
 #ifdef IMPLEMENTATION
 
 #ifdef SVQC
-#include "../../../common/vehicles/all.qh"
-#include "../../teamplay.qh"
+#include <common/vehicles/all.qh>
+#include <server/teamplay.qh>
 #endif
 
-#include "../../../lib/warpzone/common.qh"
+#include <lib/warpzone/common.qh>
 
 bool autocvar_g_ctf_allow_vehicle_carry;
 bool autocvar_g_ctf_allow_vehicle_touch;

diff --git a/qcsrc/server/mutators/mutator/gamemode_cts.qc b/qcsrc/server/mutators/mutator/gamemode_cts.qc
index 16de70e8c85fc3ab0646bfeb17375809d39ba212..1d43be9522fa9bada7acd3204c95f3d90f36d79d 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_cts.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_cts.qc
@@ -1,4 +1,4 @@
-#include "../../race.qh"
+#include <server/race.qh>
 
 #ifndef GAMEMODE_CTS_H
 #define GAMEMODE_CTS_H
@@ -44,7 +44,7 @@ const float SP_CTS_FASTEST = 6;
 
 #ifdef IMPLEMENTATION
 
-#include "../../race.qh"
+#include <server/race.qh>
 
 float autocvar_g_cts_finish_kill_delay;
 bool autocvar_g_cts_selfdamage;

diff --git a/qcsrc/server/mutators/mutator/gamemode_domination.qc b/qcsrc/server/mutators/mutator/gamemode_domination.qc
index cea24aa4eda411b24b2dd1cc9c7064401192707c..277110667f9f90eee8e4d8c2976e57f8cc3cb65c 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_domination.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_domination.qc
@@ -65,7 +65,7 @@ float domination_teams;
 
 #ifdef IMPLEMENTATION
 
-#include "../../teamplay.qh"
+#include <server/teamplay.qh>
 
 bool g_domination;
 

diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qc b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
index c750e0f7a3677204922dcea83360fc2c115db60f..cd18a51765fd0165b4c2b0c75a460ac768512404 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
@@ -61,10 +61,10 @@ const float ST_INV_KILLS = 1;
 
 #ifdef IMPLEMENTATION
 
-#include "../../../common/monsters/spawn.qh"
-#include "../../../common/monsters/sv_monsters.qh"
+#include <common/monsters/spawn.qh>
+#include <common/monsters/sv_monsters.qh>
 
-#include "../../teamplay.qh"
+#include <server/teamplay.qh>
 
 
 float autocvar_g_invasion_round_timelimit;

diff --git a/qcsrc/server/mutators/mutator/gamemode_lms.qc b/qcsrc/server/mutators/mutator/gamemode_lms.qc
index 6b293a0642de7dbc9219ad5284f4614ea4988d4b..78d4514d5ca88de52965027d7e48f4cb7baad78c 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_lms.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_lms.qc
@@ -44,8 +44,8 @@ float LMS_NewPlayerLives();
 
 #ifdef IMPLEMENTATION
 
-#include "../../campaign.qh"
-#include "../../command/cmd.qh"
+#include <server/campaign.qh>
+#include <server/command/cmd.qh>
 
 int autocvar_g_lms_extra_lives;
 bool autocvar_g_lms_join_anytime;

diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qc b/qcsrc/server/mutators/mutator/gamemode_race.qc
index 8b1375694e3e9cbcfb5c144e117a83671bf49f6d..2e28c80080db380decfb1b8b33c73906d38263a8 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_race.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_race.qc
@@ -42,7 +42,7 @@ const float SP_RACE_FASTEST = 6;
 
 #ifdef IMPLEMENTATION
 
-#include "../../race.qh"
+#include <server/race.qh>
 
 #define autocvar_g_race_laps_limit cvar("g_race_laps_limit")
 float autocvar_g_race_qualifying_timelimit;

diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc
index ed7db1e73ca3db89fdfa4ff779a0e1348ff888d8..6f7ef30d285d625fb923adeec30c23938f90ef1f 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qc
+++ b/qcsrc/server/weapons/accuracy.qc
@@ -1,10 +1,10 @@
 #include "accuracy.qh"
 
 #include "../mutators/all.qh"
-#include "../../common/constants.qh"
-#include "../../common/teams.qh"
-#include "../../common/util.qh"
-#include "../../common/weapons/all.qh"
+#include <common/constants.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
+#include <common/weapons/all.qh>
 
 int accuracy_byte(float n, float d)
 {

diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index 5efd97ae051080cb67e77f0bbb7e39572076c50e..c4a0daba4aad6f8fc2f24ee24d18cde0a7a648d3 100644 (file)
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -1,12 +1,12 @@
 #include "common.qh"
 
-#include "../../common/t_items.qh"
-#include "../../common/constants.qh"
-#include "../../common/deathtypes/all.qh"
-#include "../../common/notifications.qh"
-#include "../../common/util.qh"
-#include "../../common/weapons/all.qh"
-#include "../../common/items/all.qc"
+#include <common/t_items.qh>
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
+#include <common/notifications.qh>
+#include <common/util.qh>
+#include <common/weapons/all.qh>
+#include <common/items/all.qc>
 
 void W_GiveWeapon (entity e, float wep)
 {SELFPARAM();

diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc
index 7f3d97b943ee9242838778200d42ec9f1e8df500..f3e9f22ef6859a2b8e538a39e6b14be0b602c92f 100644 (file)
--- a/qcsrc/server/weapons/csqcprojectile.qc
+++ b/qcsrc/server/weapons/csqcprojectile.qc
@@ -1,11 +1,11 @@
 #include "csqcprojectile.qh"
 
-#include "../../common/t_items.qh"
+#include <common/t_items.qh>
 
 #include "../command/common.qh"
 
-#include "../../common/constants.qh"
-#include "../../common/weapons/all.qh"
+#include <common/constants.qh>
+#include <common/weapons/all.qh>
 
 .float csqcprojectile_type;
 

diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc
index 9846443647a921fa99e3effbc1cf669383c1be42..850315a519a1fdfa211dcefed039ecce7fb6f516 100644 (file)
--- a/qcsrc/server/weapons/hitplot.qc
+++ b/qcsrc/server/weapons/hitplot.qc
@@ -2,7 +2,7 @@
 
 #include "../antilag.qh"
 #include "../g_subs.qh"
-#include "../../common/weapons/all.qh"
+#include <common/weapons/all.qh>
 
 vector W_HitPlotUnnormalizedUntransform(vector screenforward, vector screenright, vector screenup, vector v)
 {

diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc
index 4a1b0f3f4a91c166ed22495e9d1923333eaa5494..4f512e61b2dfbeb6cd77002665807050cadb737f 100644 (file)
--- a/qcsrc/server/weapons/selection.qc
+++ b/qcsrc/server/weapons/selection.qc
@@ -1,12 +1,12 @@
 #include "selection.qh"
 
 #include "weaponsystem.qh"
-#include "../../common/t_items.qh"
-#include "../../common/constants.qh"
-#include "../../common/util.qh"
-#include "../../common/items/item.qh"
-#include "../../common/weapons/all.qh"
-#include "../../common/mutators/mutator/waypoints/waypointsprites.qh"
+#include <common/t_items.qh>
+#include <common/constants.qh>
+#include <common/util.qh>
+#include <common/items/item.qh>
+#include <common/weapons/all.qh>
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
 
 // switch between weapons
 void Send_WeaponComplain(entity e, float wpn, float type)

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 2692732878140bae805115909b55f0efc59149a6..578c941f7f123528dc29318c2a17dce989e5f805 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -2,8 +2,8 @@
 
 #include "weaponsystem.qh"
 #include "../mutators/all.qh"
-#include "../../common/t_items.qh"
-#include "../../common/weapons/all.qh"
+#include <common/t_items.qh>
+#include <common/weapons/all.qh>
 
 string W_Apply_Weaponreplace(string in)
 {

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 1e0f9c02fbbc4ebe1405bc780f92ce3fc6560ff1..6db0a3d028ba8f92f243c63c24a9c3d53688d015 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -2,14 +2,14 @@
 
 #include "weaponsystem.qh"
 #include "../mutators/all.qh"
-#include "../../common/t_items.qh"
+#include <common/t_items.qh>
 #include "../g_damage.qh"
-#include "../../common/items/item.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/notifications.qh"
-#include "../../common/triggers/subs.qh"
-#include "../../common/util.qh"
-#include "../../common/weapons/all.qh"
+#include <common/items/item.qh>
+#include <common/mapinfo.qh>
+#include <common/notifications.qh>
+#include <common/triggers/subs.qh>
+#include <common/util.qh>
+#include <common/weapons/all.qh>
 
 void thrown_wep_think()
 {SELFPARAM();

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 31d72f821f0e5ba8822f00638b77ccf60d27a2da..96062375af35f23a3d59d48ef2c75e7ce68010b9 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -9,12 +9,12 @@
 #include "../g_subs.qh"
 #include "../antilag.qh"
 
-#include "../../common/constants.qh"
-#include "../../common/util.qh"
+#include <common/constants.qh>
+#include <common/util.qh>
 
-#include "../../common/weapons/all.qh"
+#include <common/weapons/all.qh>
 
-#include "../../lib/warpzone/common.qh"
+#include <lib/warpzone/common.qh>
 
 // this function calculates w_shotorg and w_shotdir based on the weapon model
 // offset, trueaim and antilag, and won't put w_shotorg inside a wall.

diff --git a/qcsrc/server/weapons/weaponstats.qc b/qcsrc/server/weapons/weaponstats.qc
index ce1fb6100cfe6c8d16d5117b860ad30f515a8340..4e5f347488249f96f1457fffebca51ec1142da16 100644 (file)
--- a/qcsrc/server/weapons/weaponstats.qc
+++ b/qcsrc/server/weapons/weaponstats.qc
@@ -2,7 +2,7 @@
 
 #include "../g_world.qh"
 
-#include "../../common/weapons/all.qh"
+#include <common/weapons/all.qh>
 
 void WeaponStats_Init()
 {

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index f762b40dc7b9bde3f02646b741c84536497ea4c1..83ecd65e354d4077444c2228a1763858dbc2031f 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -5,14 +5,14 @@
 #include "../command/common.qh"
 #include "../mutators/all.qh"
 #include "../round_handler.qh"
-#include "../../common/t_items.qh"
-#include "../../common/animdecide.qh"
-#include "../../common/constants.qh"
-#include "../../common/monsters/all.qh"
-#include "../../common/notifications.qh"
-#include "../../common/util.qh"
-#include "../../common/weapons/all.qh"
-#include "../../lib/csqcmodel/sv_model.qh"
+#include <common/t_items.qh>
+#include <common/animdecide.qh>
+#include <common/constants.qh>
+#include <common/monsters/all.qh>
+#include <common/notifications.qh>
+#include <common/util.qh>
+#include <common/weapons/all.qh>
+#include <lib/csqcmodel/sv_model.qh>
 
 .int state;