Makefile: use `-I.`
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 30 Dec 2015 11:27:44 +0000 (22:27 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 30 Dec 2015 11:27:44 +0000 (22:27 +1100)
124 files changed:
qcsrc/Makefile
qcsrc/client/_all.qh
qcsrc/client/announcer.qc
qcsrc/client/commands/all.qc
qcsrc/client/commands/all.qh
qcsrc/client/commands/cl_cmd.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud.qh
qcsrc/client/hud/panel/minigame.qc
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/mapvoting.qc
qcsrc/client/mapvoting.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/mutators/events.qh
qcsrc/client/weapons/projectile.qc
qcsrc/common/command/generic.qc
qcsrc/common/effects/qc/casings.qc
qcsrc/common/effects/qc/damageeffects.qc
qcsrc/common/effects/qc/gibs.qc
qcsrc/common/effects/qc/globalsound.qc
qcsrc/common/items/item/ammo.qc
qcsrc/common/items/item/armor.qc
qcsrc/common/items/item/health.qc
qcsrc/common/items/item/jetpack.qc
qcsrc/common/items/item/powerup.qh
qcsrc/common/monsters/monster.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/spawn.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/breakablehook/breakablehook.qc
qcsrc/common/mutators/mutator/buffs/all.qh
qcsrc/common/mutators/mutator/buffs/buffs.qc
qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
qcsrc/common/mutators/mutator/damagetext/damagetext.qc
qcsrc/common/mutators/mutator/dodging/dodging.qc
qcsrc/common/mutators/mutator/doublejump/doublejump.qc
qcsrc/common/mutators/mutator/instagib/instagib.qc
qcsrc/common/mutators/mutator/instagib/items.qc
qcsrc/common/mutators/mutator/multijump/multijump.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/nades/nades.qh
qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc
qcsrc/common/physics/movetypes/movetypes.qc
qcsrc/common/physics/player.qc
qcsrc/common/triggers/func/breakable.qc
qcsrc/common/triggers/include.qh
qcsrc/common/triggers/misc/laser.qc
qcsrc/common/triggers/target/music.qc
qcsrc/common/triggers/target/spawn.qc
qcsrc/common/triggers/teleporters.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/trigger/secret.qc
qcsrc/common/triggers/trigger/swamp.qc
qcsrc/common/triggers/trigger/viewloc.qc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/common/turrets/turret/walker.qc
qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/vehicles/vehicle/racer_weapon.qc
qcsrc/common/vehicles/vehicle/raptor_weapons.qc
qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/porto.qc
qcsrc/lib/_all.inc
qcsrc/lib/csqcmodel/cl_model.qc
qcsrc/lib/csqcmodel/cl_player.qc
qcsrc/lib/csqcmodel/common.qh
qcsrc/lib/csqcmodel/sv_model.qc
qcsrc/lib/draw.qh
qcsrc/lib/warpzone/client.qc
qcsrc/lib/warpzone/common.qc
qcsrc/lib/warpzone/server.qc
qcsrc/lib/warpzone/util_server.qc
qcsrc/menu/command/all.qc
qcsrc/menu/command/all.qh
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/mutators/events.qh
qcsrc/menu/xonotic/campaign.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
qcsrc/menu/xonotic/statslist.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/bot/bot.qc
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/navigation.qc
qcsrc/server/bot/waypoints.qc
qcsrc/server/command/all.qc
qcsrc/server/command/all.qh
qcsrc/server/command/banning.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/common.qc
qcsrc/server/command/common.qh
qcsrc/server/command/getreplies.qc
qcsrc/server/command/radarmap.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/mutators/all.qc
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/gamemode.qh
qcsrc/server/mutators/mutator.qh
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_cts.qc
qcsrc/server/mutators/mutator/gamemode_domination.qc
qcsrc/server/mutators/mutator/gamemode_invasion.qc
qcsrc/server/mutators/mutator/gamemode_lms.qc
qcsrc/server/mutators/mutator/gamemode_race.qc
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/common.qc
qcsrc/server/weapons/csqcprojectile.qc
qcsrc/server/weapons/hitplot.qc
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/spawning.qc
qcsrc/server/weapons/throwing.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponstats.qc
qcsrc/server/weapons/weaponsystem.qc

index dac7cb2..ac418a5 100644 (file)
@@ -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
index adff5cc..5297347 100644 (file)
@@ -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"
index 109d014..707e3c8 100644 (file)
@@ -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;
index 45d9eaa..d37165c 100644 (file)
@@ -1,3 +1,3 @@
-#include "../../common/command/all.qc"
+#include <common/command/all.qc>
 
 #include "cl_cmd.qc"
index eb092c1..cdaf8c5 100644 (file)
@@ -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"
 
index 24833d8..2b52a9f 100644 (file)
@@ -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)
 {
index 3229467..64e0eca 100644 (file)
@@ -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;
index 8d4759b..7b1aed1 100644 (file)
@@ -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>
 
 
 /*
index 3633242..45dd488 100644 (file)
@@ -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();
index dbacddb..6979ee4 100644 (file)
@@ -1,3 +1,3 @@
 // Minigame
 
-#include "../../../common/minigames/cl_minigames_hud.qc"
+#include <common/minigames/cl_minigames_hud.qc>
index 128d54a..0ad5c49 100644 (file)
@@ -1,3 +1,3 @@
 // QuickMenu (#23)
 
-#include "../../quickmenu.qc"
+#include <client/quickmenu.qc>
index 2665f4e..c910f92 100644 (file)
@@ -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
index 49a92bb..6a0285d 100644 (file)
@@ -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
index a134357..48d0843 100644 (file)
@@ -3,7 +3,7 @@
 #include "hud/all.qh"
 #include "scoreboard.qh"
 
-#include "../common/mapinfo.qh"
+#include <common/mapinfo.qh>
 
 
 int mv_num_maps;
index 1c84419..bbc05d8 100644 (file)
@@ -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);
index b7962d5..0c26260 100644 (file)
@@ -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()
index 51af588..7141e44 100644 (file)
@@ -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
 
index 48f02c4..4ebe4af 100644 (file)
@@ -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;
index 6931a98..378d8c8 100644 (file)
 #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
 
 // =========================================================
index 994ea57..f68bf38 100644 (file)
@@ -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
 
index 0a8efb3..45b532b 100644 (file)
@@ -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
index 2e01a50..09be41c 100644 (file)
@@ -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;
index 7f77d84..d5324ca 100644 (file)
@@ -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)
index c1f0012..525a5b3 100644 (file)
@@ -1,6 +1,6 @@
 #include "ammo.qh"
 #ifdef SVQC
-    #include "../../t_items.qh"
+    #include <common/t_items.qh>
 #endif
 
 #ifndef MENUQC
index 277cc86..f8669e0 100644 (file)
@@ -1,6 +1,6 @@
 #include "armor.qh"
 #ifdef SVQC
-    #include "../../t_items.qh"
+    #include <common/t_items.qh>
 #endif
 
 #ifndef MENUQC
index ce9b876..93ba2f3 100644 (file)
@@ -1,6 +1,6 @@
 #include "health.qh"
 #ifdef SVQC
-    #include "../../t_items.qh"
+    #include <common/t_items.qh>
 #endif
 
 #ifndef MENUQC
index 2560697..006a363 100644 (file)
@@ -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"
index f443ab0..fd47735 100644 (file)
@@ -1,6 +1,6 @@
 #ifdef SVQC
     // For FL_POWERUP
-    #include "../../../server/constants.qh"
+    #include <server/constants.qh>
 #endif
 
 #ifndef POWERUP_H
index b8781cb..476dcfb 100644 (file)
@@ -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
index 38b34c4..ac5dd51 100644 (file)
@@ -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);
index a2a42ef..c642cb5 100644 (file)
@@ -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();
index a25a89e..8dff94a 100644 (file)
@@ -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);
index b55c5a4..4fde531 100644 (file)
@@ -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);
index f7e2e29..e2e573d 100644 (file)
@@ -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();
index fc5d46c..9a934ba 100644 (file)
@@ -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()
index 3ee077c..3719001 100644 (file)
@@ -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"));
 
index 76ecff8..d34d32d 100644 (file)
@@ -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)
index 27c0399..2c6bcfb 100644 (file)
@@ -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();
index 887dcbf..796b3d3 100644 (file)
@@ -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)
index e8f3a54..a6110b0 100644 (file)
@@ -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)
index 053cdd7..7be7d69 100644 (file)
@@ -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);
 
index a72644d..cb89f32 100644 (file)
@@ -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);
index 2db4068..947fcec 100644 (file)
@@ -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);
 
index a069e53..46bda6b 100644 (file)
@@ -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;
index eb5e64a..43be345 100644 (file)
@@ -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)
index 4b65abc..cfac982 100644 (file)
@@ -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"));
 
index 312cf4a..da80327 100644 (file)
@@ -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;
index 6ddd6db..eee3fef 100644 (file)
@@ -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"));
 
index bf1cb52..ef9f059 100644 (file)
@@ -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
index 44614c1..6cc47ea 100644 (file)
@@ -4,7 +4,7 @@
 
 #ifdef SVQC
 
-#include "../../server/miscfunctions.qh"
+#include <server/miscfunctions.qh>
 #include "../triggers/trigger/viewloc.qh"
 
 // client side physics
index 7f17de5..e43e0e4 100644 (file)
@@ -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;
 
index f69a72b..25688e3 100644 (file)
@@ -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"
index 89c6595..11b5807 100644 (file)
@@ -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
index e6f68e6..015ad91 100644 (file)
@@ -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)
index 9a1bc40..96c266f 100644 (file)
@@ -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
index e7d3c5f..37ab1f6 100644 (file)
@@ -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)
index 23bfcb2..10d422f 100644 (file)
@@ -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();
index 285ba62..9be241e 100644 (file)
@@ -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
 
index 2a03db7..89aa02f 100644 (file)
@@ -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
 
 /*
index af67533..a6d9418 100644 (file)
@@ -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)
index fbe2eb9..fc10451 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef SVQC
-#include "../../server/autocvars.qh"
+#include <server/autocvars.qh>
 
 // Generic aiming
 vector turret_aim_generic()
index a7ec5d7..c541f91 100644 (file)
@@ -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)
 {
index 11ee8eb..0d0dfb0 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef VEHICLE_BUMBLEBEE_WEAPONS_H
 #define VEHICLE_BUMBLEBEE_WEAPONS_H
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 #endif
 
index 22c3f1e..da89dc0 100644 (file)
@@ -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;
 
index 21f4313..678f9af 100644 (file)
@@ -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);
index f68b071..9af91bf 100644 (file)
@@ -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);
index bccd8b0..12007fc 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef VEHICLE_SPIDERBOT_WEAPONS_H
 #define VEHICLE_SPIDERBOT_WEAPONS_H
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 #endif
 
index 78c9c92..d531b8c 100644 (file)
@@ -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"
index 7a829d5..0438d42 100644 (file)
@@ -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.
index 216a820..d059746 100644 (file)
@@ -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);
 
index c586e90..59731c9 100644 (file)
@@ -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); }
 
index 8b4c58b..31d70ff 100644 (file)
 #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"
index a9e5ac2..6903ce0 100644 (file)
 #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;
index 869dcd7..88b2f2e 100644 (file)
 #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;
 
index c4ec135..a700f3a 100644 (file)
@@ -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\
index 207647e..7f08faf 100644 (file)
 #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
 
index 96aa790..c8d9ae8 100644 (file)
@@ -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)
        {
index e33a72b..a036692 100644 (file)
@@ -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
index a424068..080c631 100644 (file)
@@ -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)
index b97d58c..9273750 100644 (file)
@@ -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
index 742ec3e..92c347a 100644 (file)
@@ -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"
 
index 711a747..a08a1ce 100644 (file)
@@ -1,5 +1,5 @@
 #include "../menu.qh"
 
-#include "../../common/command/all.qc"
+#include <common/command/all.qc>
 
 #include "menu_cmd.qc"
index 7f116ae..f42a64f 100644 (file)
@@ -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"
 
index eedb59e..c76beca 100644 (file)
@@ -5,7 +5,7 @@
 
 #include "../mutators/events.qh"
 
-#include "../../common/command/generic.qh"
+#include <common/command/generic.qh>
 
 .entity firstChild, nextSibling;
 
index a3dc720..2b88199 100644 (file)
@@ -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
 
index a539d0f..5947c3e 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../common/campaign_common.qh"
+#include <common/campaign_common.qh>
 
 #ifndef CAMPAIGN_H
 #define CAMPAIGN_H
index e45e959..a411a8a 100644 (file)
@@ -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
index b459728..798ef3a 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../common/mapinfo.qh"
+#include <common/mapinfo.qh>
 
 #ifndef DIALOG_MULTIPLAYER_JOIN_SERVERINFO_H
 #define DIALOG_MULTIPLAYER_JOIN_SERVERINFO_H
index 4a6e03f..3a52371 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../common/playerstats.qh"
+#include <common/playerstats.qh>
 
 #ifndef STATSLIST_H
 #define STATSLIST_H
index b879257..c2a53db 100644 (file)
@@ -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)
 {
index d9beb7c..825799b 100644 (file)
 #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();
index 6371b69..ee7d39d 100644 (file)
@@ -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;
 
index 7e8b8b5..937d67d 100644 (file)
@@ -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;
 
index b4b6149..3f3a54d 100644 (file)
@@ -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
index ac37b6b..a15ae46 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../common/command/all.qc"
+#include <common/command/all.qc>
 
 #include "sv_cmd.qc"
 
index 2b240fb..0d74ec2 100644 (file)
@@ -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)
index 30d6291..9c7eb00 100644 (file)
@@ -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
index 4494c10..1900989 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 #include "cmd.qh"
 
 #include "common.qh"
 #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
 
index 8fd5fb0..c03b874 100644 (file)
@@ -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>
 
 
 // ====================================================
index 08b8b84..6aed511 100644 (file)
@@ -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
index d223302..ea61290 100644 (file)
@@ -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
index 7475c5a..cec53d4 100644 (file)
@@ -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
index 1382950..a9ce54e 100644 (file)
 
 #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();
index 37d3b78..2053d74 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../common/command/command.qh"
+#include <common/command/command.qh>
 #include "vote.qh"
 
 #include "common.qh"
 
 #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
index 72c41ad..5c6906b 100644 (file)
@@ -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"
     #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"
     #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"
index 75c1872..bff80c7 100644 (file)
@@ -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
 
index 06108be..5c17e9a 100644 (file)
 
 #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;
index f883b84..c29e10e 100644 (file)
@@ -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"
 #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
index 9100c52..df72b09 100644 (file)
@@ -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;
index 16de70e..1d43be9 100644 (file)
@@ -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;
index cea24aa..2771106 100644 (file)
@@ -65,7 +65,7 @@ float domination_teams;
 
 #ifdef IMPLEMENTATION
 
-#include "../../teamplay.qh"
+#include <server/teamplay.qh>
 
 bool g_domination;
 
index c750e0f..cd18a51 100644 (file)
@@ -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;
index 6b293a0..78d4514 100644 (file)
@@ -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;
index 8b13756..2e28c80 100644 (file)
@@ -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;
index ed7db1e..6f7ef30 100644 (file)
@@ -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)
 {
index 5efd97a..c4a0dab 100644 (file)
@@ -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();
index 7f3d97b..f3e9f22 100644 (file)
@@ -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;
 
index 9846443..850315a 100644 (file)
@@ -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)
 {
index 4a1b0f3..4f512e6 100644 (file)
@@ -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)
index 2692732..578c941 100644 (file)
@@ -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)
 {
index 1e0f9c0..6db0a3d 100644 (file)
@@ -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();
index 31d72f8..9606237 100644 (file)
@@ -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.
index ce1fb61..4e5f347 100644 (file)
@@ -2,7 +2,7 @@
 
 #include "../g_world.qh"
 
-#include "../../common/weapons/all.qh"
+#include <common/weapons/all.qh>
 
 void WeaponStats_Init()
 {
index f762b40..83ecd65 100644 (file)
@@ -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;