From: TimePath Date: Wed, 30 Dec 2015 11:27:44 +0000 (+1100) Subject: Makefile: use `-I.` X-Git-Tag: xonotic-v0.8.2~1356 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ba37d06b4afe2b08882f5cc5b211441227586b2;p=xonotic%2Fxonotic-data.pk3dir.git Makefile: use `-I.` --- diff --git a/qcsrc/Makefile b/qcsrc/Makefile index dac7cb2bd..ac418a5fa 100644 --- 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 adff5ccff..529734753 100644 --- 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 -#include "../common/effects/all.qh" -#include "../common/models/all.qh" -#include "../common/sounds/all.qh" +#include +#include +#include #include "autocvars.qh" #include "defs.qh" diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 109d01437..707e3c8a7 100644 --- 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 +#include bool announcer_1min; bool announcer_5min; diff --git a/qcsrc/client/commands/all.qc b/qcsrc/client/commands/all.qc index 45d9eaaa8..d37165ca9 100644 --- a/qcsrc/client/commands/all.qc +++ b/qcsrc/client/commands/all.qc @@ -1,3 +1,3 @@ -#include "../../common/command/all.qc" +#include #include "cl_cmd.qc" diff --git a/qcsrc/client/commands/all.qh b/qcsrc/client/commands/all.qh index eb092c12b..cdaf8c55f 100644 --- 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 #include "cl_cmd.qh" diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 24833d834..2b52a9fab 100644 --- 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 #include "cl_cmd.qh" #include "../autocvars.qh" @@ -15,9 +15,9 @@ #include "../mutators/events.qh" -#include "../../common/mapinfo.qh" +#include -#include "../../common/command/generic.qh" +#include void DrawDebugModel(entity this) { diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 322946740..64e0eca58 100644 --- 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 +#include +#include +#include +#include +#include .float death_time; .int modelflags; diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index 8d4759b1e..7b1aed124 100644 --- 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 +#include +#include +#include +#include +#include +#include // TODO: remove -#include "../../server/mutators/mutator/gamemode_ctf.qc" +#include /* diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh index 363324252..45dd4887f 100644 --- 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 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 dbacddbe2..6979ee413 100644 --- 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 diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index 128d54aaa..0ad5c4965 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -1,3 +1,3 @@ // QuickMenu (#23) -#include "../../quickmenu.qc" +#include diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 2665f4ed1..c910f9250 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,26 +1,26 @@ #include "main.qh" -#include "../common/effects/qc/all.qh" +#include #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 #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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // -------------------------------------------------------------------------- // BEGIN REQUIRED CSQC FUNCTIONS diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh index 49a92bb45..6a0285d5f 100644 --- 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 +#include // -------------------------------------------------------------------------- // MENU Functionality diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index a134357aa..48d0843b0 100644 --- 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 int mv_num_maps; diff --git a/qcsrc/client/mapvoting.qh b/qcsrc/client/mapvoting.qh index 1c8441948..bbc05d884 100644 --- 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 void MapVote_Draw(); void Cmd_MapVote_MapDownload(float argc); diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index b7962d52d..0c262604b 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -2,11 +2,11 @@ #include "hud/all.qh" -#include "../common/command/generic.qh" +#include -#include "../common/teams.qh" +#include -#include "../lib/csqcmodel/cl_model.qh" +#include void AuditLists() diff --git a/qcsrc/client/mutators/events.qh b/qcsrc/client/mutators/events.qh index 51af58839..7141e4455 100644 --- 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 // globals diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index 48f02c4fe..4ebe4afcf 100644 --- 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 +#include -#include "../../lib/csqcmodel/interpolate.qh" +#include -#include "../../lib/warpzone/anglestransform.qh" +#include .float alpha; .float scale; diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 6931a98c2..378d8c8c6 100644 --- 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 #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 + #include + #include + #include + #include + #include #endif // ========================================================= diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc index 994ea5747..f68bf383d 100644 --- a/qcsrc/common/effects/qc/casings.qc +++ b/qcsrc/common/effects/qc/casings.qc @@ -1,9 +1,9 @@ #ifdef IMPLEMENTATION -#include "../../util.qh" +#include #ifdef CSQC -#include "../../physics/movetypes/movetypes.qh" +#include #include "rubble.qh" #endif diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc index 0a8efb3b3..45b532b8a 100644 --- 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 +#include +#include +#include +#include #endif #endif diff --git a/qcsrc/common/effects/qc/gibs.qc b/qcsrc/common/effects/qc/gibs.qc index 2e01a507f..09be41c6a 100644 --- 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 .float scale; .float alpha; diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc index 7f77d8400..d5324ca6f 100644 --- 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 #ifdef IMPLEMENTATION - #include "../../animdecide.qh" + #include #ifdef SVQC - #include "../../../server/cl_player.qh" + #include #endif REGISTER_NET_TEMP(globalsound) diff --git a/qcsrc/common/items/item/ammo.qc b/qcsrc/common/items/item/ammo.qc index c1f0012be..525a5b3d9 100644 --- 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 #endif #ifndef MENUQC diff --git a/qcsrc/common/items/item/armor.qc b/qcsrc/common/items/item/armor.qc index 277cc8614..f8669e0e0 100644 --- 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 #endif #ifndef MENUQC diff --git a/qcsrc/common/items/item/health.qc b/qcsrc/common/items/item/health.qc index ce9b8760b..93ba2f36e 100644 --- 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 #endif #ifndef MENUQC diff --git a/qcsrc/common/items/item/jetpack.qc b/qcsrc/common/items/item/jetpack.qc index 256069790..006a36308 100644 --- 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 + #include #endif #include "ammo.qh" diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh index f443ab0af..fd477354f 100644 --- 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 #endif #ifndef POWERUP_H diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh index b8781cbf9..476dcfbe2 100644 --- 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 +#include +#include +#include +#include +#include +#include #endif // special spawn flags diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index 38b34c425..ac5dd514c 100644 --- 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 +#include 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 a2a42ef99..c642cb5fa 100644 --- 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 void M_Shambler_Attack_Lightning_Explode() {SELFPARAM(); diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index a25a89e7d..8dff94a6a 100644 --- 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 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 b55c5a42d..4fde5311d 100644 --- 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 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 f7e2e292f..e2e573d65 100644 --- 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 + #include #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 fc5d46c68..9a934ba74 100644 --- 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 #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 + #include #include "../deathtypes/all.qh" - #include "../../server/mutators/all.qh" - #include "../../server/steerlib.qh" + #include + #include #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 + #include + #include #include "../triggers/triggers.qh" - #include "../../lib/csqcmodel/sv_model.qh" - #include "../../server/round_handler.qh" + #include + #include #endif void monsters_setstatus() diff --git a/qcsrc/common/mutators/mutator/breakablehook/breakablehook.qc b/qcsrc/common/mutators/mutator/breakablehook/breakablehook.qc index 3ee077c72..3719001a4 100644 --- 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 +#include 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 76ecff8be..d34d32d07 100644 --- 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 +#include 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 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 27c039982..2c6bcfb41 100644 --- 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 +#include .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 887dcbf95..796b3d395 100644 --- 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 #endif -#include "../../../physics/player.qh" +#include #if defined(SVQC) diff --git a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc index e8f3a54bf..a6110b01a 100644 --- 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 #endif #endif @@ -134,7 +134,7 @@ NET_HANDLE(damagetext, bool isNew) #ifdef MENUQC CLASS(XonoticDamageTextSettings, XonoticTab) - #include "../../../../menu/gamesettings.qh" + #include 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 053cdd739..7be7d6939 100644 --- 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 +#include .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 a72644d9c..cb89f32b0 100644 --- 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 #endif -#include "../../../physics/player.qh" +#include #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 2db406807..947fcec12 100644 --- 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 -#include "../../../items/all.qc" +#include 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 a069e535f..46bda6b69 100644 --- 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 +#include +#include 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 eb5e64a40..43be345c1 100644 --- 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 #endif -#include "../../../physics/player.qh" +#include #if defined(SVQC) diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 4b65abc55..cfac98232 100644 --- 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 +#include +#include +#include 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 312cf4ae2..da80327bb 100644 --- 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 // 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 6ddd6db94..eee3fef02 100644 --- 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 +#include REGISTER_MUTATOR(rm, cvar("g_instagib")); diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc index bf1cb52e2..ef9f05981 100644 --- 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 + #include + #include #include "movetypes.qh" - #include "../../../lib/csqcmodel/common.qh" - #include "../../t_items.qh" + #include + #include #elif defined(MENUQC) #elif defined(SVQC) - #include "../../../server/autocvars.qh" + #include #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 44614c1bd..6cc47ea63 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -4,7 +4,7 @@ #ifdef SVQC -#include "../../server/miscfunctions.qh" +#include #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 7f17de515..e43e0e4c4 100644 --- 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 +#include +#include +#include +#include +#include .entity sprite; diff --git a/qcsrc/common/triggers/include.qh b/qcsrc/common/triggers/include.qh index f69a72b0a..25688e3ec 100644 --- 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 #endif #include "triggers.qh" #include "subs.qh" diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc index 89c659530..11b5807f6 100644 --- 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 + #include + #include #elif defined(MENUQC) #elif defined(SVQC) #endif diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc index e6f68e68b..015ad9138 100644 --- 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 + #include + #include #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 9a1bc40e6..96c266f6c 100644 --- 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 + #include #endif #ifdef SVQC diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc index e7d3c5fd7..37ab1f694 100644 --- 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 + #include + #include #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 + #include + #include + #include #include "../deathtypes/all.qh" #include "../turrets/sv_turrets.qh" #include "../vehicles/all.qh" #include "../mapinfo.qh" - #include "../../server/anticheat.qh" + #include #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 23bfcb245..10d422fd6 100644 --- 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 void trigger_push_use() {SELFPARAM(); diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/triggers/trigger/secret.qc index 285ba62a9..9be241e7f 100644 --- 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 + #include #include "secret.qh" #endif diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc index 2a03db78d..89aa02fe4 100644 --- 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 + #include + #include + #include #endif /* diff --git a/qcsrc/common/triggers/trigger/viewloc.qc b/qcsrc/common/triggers/trigger/viewloc.qc index af67533a8..a6d9418b3 100644 --- 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 + #include #endif REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC) diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc index fbe2eb9e6..fc10451d3 100644 --- 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 // Generic aiming vector turret_aim_generic() diff --git a/qcsrc/common/turrets/turret/walker.qc b/qcsrc/common/turrets/turret/walker.qc index a7ec5d76d..c541f9131 100644 --- 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 void walker_draw(entity this) { diff --git a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc index 11ee8ebc7..0d0dfb0d1 100644 --- 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 #endif diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc index 22c3f1e02..da89dc0aa 100644 --- 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 bool autocvar_g_vehicle_racer; diff --git a/qcsrc/common/vehicles/vehicle/racer_weapon.qc b/qcsrc/common/vehicles/vehicle/racer_weapon.qc index 21f4313c6..678f9af0b 100644 --- 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 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 f68b07188..9af91bf51 100644 --- 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 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 bccd8b0ae..12007fc39 100644 --- 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 #endif diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 78c9c923d..d531b8c3f 100644 --- 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 #include "../constants.qh" #include "../stats.qh" - #include "../../lib/warpzone/anglestransform.qh" - #include "../../lib/warpzone/common.qh" - #include "../../lib/warpzone/client.qh" + #include + #include + #include #include "../util.qh" - #include "../../client/autocvars.qh" + #include #include "../deathtypes/all.qh" - #include "../../lib/csqcmodel/interpolate.qh" + #include #include "../physics/movetypes/movetypes.qh" - #include "../../client/main.qh" - #include "../../lib/csqcmodel/cl_model.qh" + #include + #include #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 + #include + #include + #include #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 + #include #include "../t_items.qh" - #include "../../server/autocvars.qh" - #include "../../server/constants.qh" - #include "../../server/defs.qh" + #include + #include + #include #include "../notifications.qh" #include "../deathtypes/all.qh" - #include "../../server/mutators/all.qh" + #include #include "../mapinfo.qh" - #include "../../server/command/common.qh" - #include "../../lib/csqcmodel/sv_model.qh" - #include "../../server/portals.qh" - #include "../../server/g_hook.qh" + #include + #include + #include + #include #endif #ifndef MENUQC #include "calculations.qc" diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 7a829d5d1..0438d42e0 100644 --- 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 #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 216a82074..d059746f1 100644 --- 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 +#include 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 c586e907f..59731c954 100644 --- 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 spawnfunc(weapon_porto) { weapon_defaultspawnfunc(this, WEP_PORTO); } diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc index 8b4c58bdd..31d70ffe4 100644 --- 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 + #include #elif defined(SVQC) - #include "../server/sys-pre.qh" - #include "../dpdefs/progsdefs.qh" - #include "../dpdefs/dpextensions.qh" - #include "../server/sys-post.qh" + #include + #include + #include + #include #elif defined(MENUQC) - #include "../dpdefs/menudefs.qh" - #include "../dpdefs/keycodes.qh" + #include + #include #endif #include "macro.qh" diff --git a/qcsrc/lib/csqcmodel/cl_model.qc b/qcsrc/lib/csqcmodel/cl_model.qc index a9e5ac258..6903ce07d 100644 --- 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 +#include +#include +#include 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 869dcd770..88b2f2ec8 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include float autocvar_cl_movement_errorcompensation = 0; diff --git a/qcsrc/lib/csqcmodel/common.qh b/qcsrc/lib/csqcmodel/common.qh index c4ec135e8..a700f3af2 100644 --- 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 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 207647e0d..7f08faf43 100644 --- 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 +#include +#include +#include +#include // generic CSQC model code diff --git a/qcsrc/lib/draw.qh b/qcsrc/lib/draw.qh index 96aa7901b..c8d9ae8de 100644 --- 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 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 e33a72b1e..a0366922c 100644 --- 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 + #include #elif defined(MENUQC) #elif defined(SVQC) #endif diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc index a4240680a..080c6310b 100644 --- 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 #elif defined(MENUQC) #elif defined(SVQC) - #include "../../common/weapons/all.qh" + #include #endif void WarpZone_Accumulator_Clear(entity acc) diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc index b97d58ca0..927375043 100644 --- 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 + #include + #include + #include + #include + #include #endif #ifdef WARPZONELIB_KEEPDEBUG diff --git a/qcsrc/lib/warpzone/util_server.qc b/qcsrc/lib/warpzone/util_server.qc index 742ec3e20..92c347a15 100644 --- 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 #endif #include "common.qh" diff --git a/qcsrc/menu/command/all.qc b/qcsrc/menu/command/all.qc index 711a747ea..a08a1cee1 100644 --- 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 #include "menu_cmd.qc" diff --git a/qcsrc/menu/command/all.qh b/qcsrc/menu/command/all.qh index 7f116ae9f..f42a64ff0 100644 --- 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 #include "menu_cmd.qh" diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index eedb59eca..c76beca04 100644 --- 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 .entity firstChild, nextSibling; diff --git a/qcsrc/menu/mutators/events.qh b/qcsrc/menu/mutators/events.qh index a3dc720e8..2b881992e 100644 --- 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 // globals diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc index a539d0f6f..5947c3e73 100644 --- a/qcsrc/menu/xonotic/campaign.qc +++ b/qcsrc/menu/xonotic/campaign.qc @@ -1,4 +1,4 @@ -#include "../../common/campaign_common.qh" +#include #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 e45e9595f..a411a8a7f 100644 --- 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 #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 b45972859..798ef3ae7 100644 --- 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 #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 4a6e03f28..3a52371d1 100644 --- a/qcsrc/menu/xonotic/statslist.qc +++ b/qcsrc/menu/xonotic/statslist.qc @@ -1,4 +1,4 @@ -#include "../../common/playerstats.qh" +#include #ifndef STATSLIST_H #define STATSLIST_H diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index b879257b7..c2a53db93 100644 --- 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 +#include +#include +#include +#include float GL_CheckExtension(string ext) { diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc index d9beb7c53..825799b28 100644 --- 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 #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 +#include +#include +#include -#include "../../common/weapons/all.qh" +#include -#include "../../lib/csqcmodel/sv_model.qh" +#include -#include "../../lib/warpzone/common.qh" -#include "../../lib/warpzone/util_server.qh" +#include +#include entity bot_spawn() {SELFPARAM(); diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc index 6371b6916..ee7d39d17 100644 --- 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 +#include -#include "../../../common/triggers/trigger/jumppads.qh" +#include -#include "../../../lib/warpzone/common.qh" +#include .float speed; diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc index 7e8b8b530..937d67d3d 100644 --- 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 -#include "../../common/items/all.qh" +#include -#include "../../common/constants.qh" -#include "../../common/triggers/trigger/jumppads.qh" +#include +#include .float speed; diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc index b4b614967..3f3a54dd3 100644 --- a/qcsrc/server/bot/waypoints.qc +++ b/qcsrc/server/bot/waypoints.qc @@ -5,10 +5,10 @@ #include "../antilag.qh" -#include "../../common/constants.qh" +#include -#include "../../lib/warpzone/common.qh" -#include "../../lib/warpzone/util_server.qh" +#include +#include // 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 ac37b6b2c..a15ae46de 100644 --- a/qcsrc/server/command/all.qc +++ b/qcsrc/server/command/all.qc @@ -1,4 +1,4 @@ -#include "../../common/command/all.qc" +#include #include "sv_cmd.qc" diff --git a/qcsrc/server/command/all.qh b/qcsrc/server/command/all.qh index 2b240fb2a..0d74ec273 100644 --- 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 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 30d6291f6..9c7eb00ca 100644 --- a/qcsrc/server/command/banning.qc +++ b/qcsrc/server/command/banning.qc @@ -1,4 +1,4 @@ -#include "../../common/command/command.qh" +#include #include "banning.qh" #include "common.qh" @@ -6,7 +6,7 @@ #include "../cl_player.qh" #include "../ipban.qh" -#include "../../common/util.qh" +#include // ===================================================== // Banning and kicking command code, written by Samual diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 4494c104d..1900989e6 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1,4 +1,4 @@ -#include "../../common/command/command.qh" +#include #include "cmd.qh" #include "common.qh" @@ -15,25 +15,25 @@ #include "../mutators/all.qh" #ifdef SVQC - #include "../../common/vehicles/all.qh" + #include #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 +#include +#include +#include +#include +#include +#include +#include -#include "../../common/minigames/sv_minigames.qh" +#include -#include "../../common/monsters/all.qc" -#include "../../common/monsters/spawn.qh" -#include "../../common/monsters/sv_monsters.qh" +#include +#include +#include -#include "../../lib/warpzone/common.qh" +#include 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 8fd5fb047..c03b874d1 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -1,11 +1,11 @@ -#include "../../common/command/command.qh" +#include #include "common.qh" #include "../scores.qh" -#include "../../common/monsters/all.qh" -#include "../../common/notifications.qh" -#include "../../lib/warpzone/common.qh" +#include +#include +#include // ==================================================== diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh index 08b8b848f..6aed511e1 100644 --- 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 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 -#include "../../common/command/generic.qh" -#include "../../common/command/command.qh" +#include +#include // ============================================================ // Shared declarations for server commands, written by Samual diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc index d2233029d..ea61290e5 100644 --- a/qcsrc/server/command/getreplies.qc +++ b/qcsrc/server/command/getreplies.qc @@ -1,13 +1,13 @@ -#include "../../common/command/command.qh" +#include #include "getreplies.qh" #include "../race.qh" -#include "../../common/constants.qh" -#include "../../common/mapinfo.qh" -#include "../../common/util.qh" +#include +#include +#include -#include "../../common/monsters/all.qh" +#include // ========================================================= // Reply messages for common commands, re-worked by Samual diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc index 7475c5a54..cec53d4f3 100644 --- a/qcsrc/server/command/radarmap.qc +++ b/qcsrc/server/command/radarmap.qc @@ -1,12 +1,12 @@ -#include "../../common/command/command.qh" +#include #include "radarmap.qh" #include "../g_world.qh" #include "../g_subs.qh" -#include "../../common/util.qh" +#include -#include "../../lib/csqcmodel/sv_model.qh" +#include // =============================================== // 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 13829504a..a9ce54e30 100644 --- 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 +#include +#include +#include +#include -#include "../../common/monsters/sv_monsters.qh" +#include void PutObserverInServer(); diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 37d3b78e6..2053d74ea 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -1,4 +1,4 @@ -#include "../../common/command/command.qh" +#include #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 +#include +#include +#include +#include // ============================================= // Server side voting code, reworked by Samual diff --git a/qcsrc/server/mutators/all.qc b/qcsrc/server/mutators/all.qc index 72c41ad47..5c6906b7c 100644 --- 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 + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include #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 #include "../autocvars.qh" #include "../constants.qh" #include "../defs.qh" - #include "../../common/notifications.qh" - #include "../../common/deathtypes/all.qh" + #include + #include #include "all.qh" - #include "../../common/turrets/sv_turrets.qh" - #include "../../common/vehicles/all.qh" + #include + #include #include "../campaign.qh" - #include "../../common/campaign_common.qh" - #include "../../common/mapinfo.qh" + #include + #include #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 + #include + #include #include "../anticheat.qh" #include "../cheats.qh" - #include "../../common/playerstats.qh" + #include #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 #endif #include "all.qh" diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh index 75c1872aa..bff80c7ce 100644 --- 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 // register all possible hooks here diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh index 06108be95..5c17e9a17 100644 --- 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 #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 +#include +#include +#include +#include +#include -#include "../../lib/warpzone/server.qh" -#include "../../lib/warpzone/util_server.qh" +#include +#include .float lastground; float total_players; diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh index f883b84b4..c29e10eb8 100644 --- 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 #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 +#include +#include +#include +#include +#include -#include "../../common/monsters/all.qh" +#include -#include "../../lib/warpzone/anglestransform.qh" -#include "../../lib/warpzone/server.qh" -#include "../../lib/warpzone/util_server.qh" +#include +#include +#include #endif diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc index 9100c52ba..df72b097e 100644 --- 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 +#include #endif -#include "../../../lib/warpzone/common.qh" +#include 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 16de70e8c..1d43be952 100644 --- a/qcsrc/server/mutators/mutator/gamemode_cts.qc +++ b/qcsrc/server/mutators/mutator/gamemode_cts.qc @@ -1,4 +1,4 @@ -#include "../../race.qh" +#include #ifndef GAMEMODE_CTS_H #define GAMEMODE_CTS_H @@ -44,7 +44,7 @@ const float SP_CTS_FASTEST = 6; #ifdef IMPLEMENTATION -#include "../../race.qh" +#include 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 cea24aa4e..277110667 100644 --- 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 bool g_domination; diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qc b/qcsrc/server/mutators/mutator/gamemode_invasion.qc index c750e0f7a..cd18a5176 100644 --- 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 +#include -#include "../../teamplay.qh" +#include 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 6b293a064..78d4514d5 100644 --- 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 +#include 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 8b1375694..2e28c8008 100644 --- 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 #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 ed7db1e73..6f7ef30d2 100644 --- 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 +#include +#include +#include int accuracy_byte(float n, float d) { diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc index 5efd97ae0..c4a0daba4 100644 --- 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 +#include +#include +#include +#include +#include +#include void W_GiveWeapon (entity e, float wep) {SELFPARAM(); diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc index 7f3d97b94..f3e9f22ef 100644 --- 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 #include "../command/common.qh" -#include "../../common/constants.qh" -#include "../../common/weapons/all.qh" +#include +#include .float csqcprojectile_type; diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc index 984644364..850315a51 100644 --- 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 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 4a1b0f3f4..4f512e61b 100644 --- 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 +#include +#include +#include +#include +#include // 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 269273287..578c941f7 100644 --- 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 +#include string W_Apply_Weaponreplace(string in) { diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 1e0f9c02f..6db0a3d02 100644 --- 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 #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 +#include +#include +#include +#include +#include void thrown_wep_think() {SELFPARAM(); diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index 31d72f821..96062375a 100644 --- 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 +#include -#include "../../common/weapons/all.qh" +#include -#include "../../lib/warpzone/common.qh" +#include // 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 ce1fb6100..4e5f34748 100644 --- 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 void WeaponStats_Init() { diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index f762b40dc..83ecd65e3 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include .int state;