]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Cleanup common includes
authorAmadeusz Sławiński <amade@asmblr.net>
Wed, 14 Oct 2020 20:44:07 +0000 (20:44 +0000)
committerMario <mario.mario@y7mail.com>
Wed, 14 Oct 2020 20:44:07 +0000 (20:44 +0000)
Instead of:
#include "../common/(...)"
use:
#include <common/(...)>

21 files changed:
qcsrc/client/player_skeleton.qc
qcsrc/client/teamradar.qc
qcsrc/menu/draw.qc
qcsrc/menu/menu.qc
qcsrc/server/campaign.qc
qcsrc/server/cheats.qc
qcsrc/server/client.qc
qcsrc/server/damage.qc
qcsrc/server/hook.qc
qcsrc/server/impulse.qc
qcsrc/server/ipban.qc
qcsrc/server/main.qc
qcsrc/server/mapvoting.qc
qcsrc/server/player.qc
qcsrc/server/portals.qc
qcsrc/server/race.qc
qcsrc/server/round_handler.qc
qcsrc/server/scores.qc
qcsrc/server/spawnpoints.qc
qcsrc/server/teamplay.qc
qcsrc/server/world.qc

index d9c9ab14210353a5490d4e9dc5deadde59763577..ef2b6c4cb23bb00ba83cc4d334c300da2bc121d8 100644 (file)
@@ -3,8 +3,8 @@
 #include <common/physics/movetypes/movetypes.qh>
 #include <common/physics/player.qh>
 #include <client/mutators/_mod.qh>
-#include "../lib/csqcmodel/cl_player.qh"
-#include "../lib/warpzone/anglestransform.qh"
+#include <lib/csqcmodel/cl_player.qh>
+#include <lib/warpzone/anglestransform.qh>
 
 .float v_angle_save_x;
 
index 2e6ddba229d8ff46cc0228251df2ed8ad41a881c..e67213e3b9ab04361386b96d16e368c5a4b87b05 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <common/mutators/mutator/waypoints/all.qh>
 
-#include "../lib/csqcmodel/interpolate.qh"
+#include <lib/csqcmodel/interpolate.qh>
 
 vector teamradar_3dcoord_to_texcoord(vector in)
 {
index ae6967e367565fc02c38f08f57c77ac0ccca706d..0b29572bee644865b70ebc3ddc6815bdc3806fa0 100644 (file)
@@ -1,6 +1,6 @@
 #include "draw.qh"
-#include "../common/util.qh"
-#include "../common/constants.qh"
+#include <common/util.qh>
+#include <common/constants.qh>
 
 string draw_mousepointer;
 vector draw_mousepointer_offset;
index 8e55312ba138a9aa50d2c72a035b0910e00725a2..84caecb75bbf33ca0b16cd51ad6f4c626fda3341 100644 (file)
 
 #include "xonotic/util.qh"
 
-#include "../common/items/_mod.qh"
+#include <common/items/_mod.qh>
 #include <common/weapons/_all.qh>
-#include "../common/mapinfo.qh"
-#include "../common/mutators/base.qh"
+#include <common/mapinfo.qh>
+#include <common/mutators/base.qh>
 
 int mouseButtonsPressed;
 vector menuMousePos;
index cda65308d721ef3e45564dc6d90f48b4e1f43bf5..2ac3c58d1f5089fa3744300b14dc342b19c77c23 100644 (file)
@@ -8,7 +8,7 @@
 #include <server/intermission.qh>
 #include "world.qh"
 
-#include "../common/campaign_common.qh"
+#include <common/campaign_common.qh>
 
 // campaign cvars:
 //   _campaign_index: index of CURRENT map
index 2306abd693ec02aad534192dc95b7f84710ddefe..75d0e2caf810ddbbfc90c9d0b5a01e60931d8977 100644 (file)
 #include "clientkill.qh"
 #include "player.qh"
 #include "race.qh"
-#include "../common/mapobjects/teleporters.qh"
+#include <common/mapobjects/teleporters.qh>
 
 #include <server/mutators/_mod.qh>
 
 #include "weapons/tracing.qh"
 
-#include "../common/constants.qh"
-#include "../common/deathtypes/all.qh"
-#include "../common/util.qh"
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
+#include <common/util.qh>
 
 #include <common/physics/player.qh>
 
-#include "../common/monsters/_mod.qh"
+#include <common/monsters/_mod.qh>
 
 #include <common/items/_mod.qh>
 
 #include <common/weapons/_all.qh>
 
-#include "../common/mapobjects/subs.qh"
+#include <common/mapobjects/subs.qh>
 #include <common/mapobjects/triggers.qh>
 
-#include "../common/mapobjects/func/breakable.qh"
+#include <common/mapobjects/func/breakable.qh>
 
-#include "../lib/csqcmodel/sv_model.qh"
+#include <lib/csqcmodel/sv_model.qh>
 
-#include "../lib/warpzone/anglestransform.qh"
-#include "../lib/warpzone/util_server.qh"
+#include <lib/warpzone/anglestransform.qh>
+#include <lib/warpzone/util_server.qh>
 
 #ifdef NOCHEATS
 
index d67cd46aee5441a8a4dc0315299c25fa730574b0..f06f640840e2753be1553f51c1ba1a193c93739e 100644 (file)
 
 #include "bot/api.qh"
 
-#include "../common/ent_cs.qh"
-#include "../common/wepent.qh"
+#include <common/ent_cs.qh>
+#include <common/wepent.qh>
 #include <common/state.qh>
 
 #include "compat/quake3.qh"
 
 #include <common/effects/qc/globalsound.qh>
 
-#include "../common/mapobjects/func/conveyor.qh"
+#include <common/mapobjects/func/conveyor.qh>
 #include <common/mapobjects/func/ladder.qh>
-#include "../common/mapobjects/teleporters.qh"
-#include "../common/mapobjects/target/spawnpoint.qh"
+#include <common/mapobjects/teleporters.qh>
+#include <common/mapobjects/target/spawnpoint.qh>
 #include <common/mapobjects/trigger/counter.qh>
 #include <common/mapobjects/trigger/swamp.qh>
 
-#include "../common/vehicles/all.qh"
+#include <common/vehicles/all.qh>
 
 #include "weapons/hitplot.qh"
 #include "weapons/selection.qh"
 #include "weapons/weaponsystem.qh"
 
-#include "../common/net_notice.qh"
-#include "../common/net_linked.qh"
-#include "../common/physics/player.qh"
+#include <common/net_notice.qh>
+#include <common/net_linked.qh>
+#include <common/physics/player.qh>
 
 #include <common/vehicles/sv_vehicles.qh>
 
-#include "../common/items/_mod.qh"
+#include <common/items/_mod.qh>
 
 #include <common/gamemodes/gamemode/nexball/sv_nexball.qh>
 
-#include "../common/mutators/mutator/waypoints/all.qh"
-#include "../common/mutators/mutator/instagib/sv_instagib.qh"
+#include <common/mutators/mutator/waypoints/all.qh>
+#include <common/mutators/mutator/instagib/sv_instagib.qh>
 #include <common/gamemodes/_mod.qh>
 
-#include "../common/mapobjects/subs.qh"
-#include "../common/mapobjects/triggers.qh"
-#include "../common/mapobjects/trigger/secret.qh"
+#include <common/mapobjects/subs.qh>
+#include <common/mapobjects/triggers.qh>
+#include <common/mapobjects/trigger/secret.qh>
 
-#include "../common/minigames/sv_minigames.qh"
+#include <common/minigames/sv_minigames.qh>
 
-#include "../common/items/inventory.qh"
+#include <common/items/inventory.qh>
 
-#include "../common/monsters/sv_monsters.qh"
+#include <common/monsters/sv_monsters.qh>
 
-#include "../lib/warpzone/server.qh"
+#include <lib/warpzone/server.qh>
 
 #include <common/mutators/mutator/overkill/oknex.qh>
 
index f0655a9f895d2b746281632a6cfeb1b6a03a8e43..c253c091515433e571623f21dcc5e4956951342e 100644 (file)
 #include "teamplay.qh"
 #include "scores.qh"
 #include "spawnpoints.qh"
-#include "../common/state.qh"
-#include "../common/physics/player.qh"
+#include <common/state.qh>
+#include <common/physics/player.qh>
 #include "resources.qh"
-#include "../common/vehicles/all.qh"
-#include "../common/items/_mod.qh"
-#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
-#include "../common/mutators/mutator/instagib/sv_instagib.qh"
-#include "../common/mutators/mutator/buffs/buffs.qh"
+#include <common/vehicles/all.qh>
+#include <common/items/_mod.qh>
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
+#include <common/mutators/mutator/instagib/sv_instagib.qh>
+#include <common/mutators/mutator/buffs/buffs.qh>
 #include "weapons/accuracy.qh"
 #include "weapons/csqcprojectile.qh"
 #include "weapons/selection.qh"
-#include "../common/constants.qh"
-#include "../common/deathtypes/all.qh"
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
 #include <common/mapobjects/defs.qh>
 #include <common/mapobjects/triggers.qh>
-#include "../common/notifications/all.qh"
-#include "../common/physics/movetypes/movetypes.qh"
-#include "../common/playerstats.qh"
-#include "../common/teams.qh"
-#include "../common/util.qh"
+#include <common/notifications/all.qh>
+#include <common/physics/movetypes/movetypes.qh>
+#include <common/playerstats.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/gamemodes/rules.qh>
 #include <common/weapons/_all.qh>
-#include "../lib/csqcmodel/sv_model.qh"
-#include "../lib/warpzone/common.qh"
+#include <lib/csqcmodel/sv_model.qh>
+#include <lib/warpzone/common.qh>
 
 void UpdateFrags(entity player, int f)
 {
index 596b542e76a0453e380e7f23b46acd8608d60088..4fa2385cf6a58bd1df00950314af4d54eca0e6fa 100644 (file)
 #include "command/common.qh"
 #include "command/vote.qh"
 #include "round_handler.qh"
-#include "../common/state.qh"
-#include "../common/physics/player.qh"
-#include "../common/vehicles/all.qh"
-#include "../common/constants.qh"
-#include "../common/util.qh"
+#include <common/state.qh>
+#include <common/physics/player.qh>
+#include <common/vehicles/all.qh>
+#include <common/constants.qh>
+#include <common/util.qh>
 #include <common/net_linked.qh>
 #include <common/weapons/_all.qh>
-#include "../lib/warpzone/common.qh"
-#include "../lib/warpzone/server.qh"
+#include <lib/warpzone/common.qh>
+#include <lib/warpzone/server.qh>
 
 /*============================================
 
index 3477c0c88dea665063cb73332b1898a09a9d8600..f425101792f88aee6b0f2ba781031e69973fe607 100644 (file)
 
 #include <common/state.qh>
 
-#include "../common/minigames/sv_minigames.qh"
+#include <common/minigames/sv_minigames.qh>
 
 #include <common/weapons/_all.qh>
-#include "../common/vehicles/sv_vehicles.qh"
+#include <common/vehicles/sv_vehicles.qh>
 
-#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
 
 .entity vehicle;
 
index 4c386b8f30d65dde70277c6f60080e7b6beacf67..bd3aa75c251aae2f712cb2319e1a5ac20c658193 100644 (file)
@@ -5,8 +5,8 @@
 #include "autocvars.qh"
 #include <server/main.qh>
 #include "command/banning.qh"
-#include "../common/constants.qh"
-#include "../common/util.qh"
+#include <common/constants.qh>
+#include <common/util.qh>
 
 /*
  * Protocol of online ban list:
index 2546362af83ee9a1e03cd7a9a46b7097e14c2222..cd84923aef067ae5d002da9ee025b39d8ac11ec1 100644 (file)
 #include <server/weapons/common.qh>
 #include <server/compat/quake3.qh>
 
-#include "../common/constants.qh"
+#include <common/constants.qh>
 #include <common/command/generic.qh>
-#include "../common/deathtypes/all.qh"
-#include "../common/debug.qh"
-#include "../common/mapinfo.qh"
-#include "../common/util.qh"
+#include <common/deathtypes/all.qh>
+#include <common/debug.qh>
+#include <common/mapinfo.qh>
+#include <common/util.qh>
 
-#include "../common/vehicles/all.qh"
+#include <common/vehicles/all.qh>
 #include <common/monsters/sv_monsters.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/server.qh"
+#include <lib/warpzone/common.qh>
+#include <lib/warpzone/server.qh>
 
 void CreatureFrame_hotliquids(entity this)
 {
index d0ade66c593f3b14c5162ad9114aa8296057ae01..bb76bde5a35da2de67af8aa394f3beb4ca62f8e2 100644 (file)
@@ -8,12 +8,12 @@
 #include "world.qh"
 #include "command/cmd.qh"
 #include "command/getreplies.qh"
-#include "../common/constants.qh"
+#include <common/constants.qh>
 #include <common/net_linked.qh>
-#include "../common/mapinfo.qh"
-#include "../common/playerstats.qh"
+#include <common/mapinfo.qh>
+#include <common/playerstats.qh>
 #include <common/state.qh>
-#include "../common/util.qh"
+#include <common/util.qh>
 
 
 // definitions
index a632aab01c7625452f5ff887bd21fb578cf43f43..ed824bd04c091168aa28802f9b8135531c9c4e60 100644 (file)
 #include "weapons/throwing.qh"
 #include "command/common.qh"
 #include "command/vote.qh"
-#include "../common/state.qh"
-#include "../common/anim.qh"
-#include "../common/animdecide.qh"
-#include "../common/csqcmodel_settings.qh"
-#include "../common/gamemodes/sv_rules.qh"
-#include "../common/deathtypes/all.qh"
-#include "../common/mapobjects/subs.qh"
+#include <common/state.qh>
+#include <common/anim.qh>
+#include <common/animdecide.qh>
+#include <common/csqcmodel_settings.qh>
+#include <common/gamemodes/sv_rules.qh>
+#include <common/deathtypes/all.qh>
+#include <common/mapobjects/subs.qh>
 #include <common/mapobjects/teleporters.qh>
-#include "../common/playerstats.qh"
-#include "../lib/csqcmodel/sv_model.qh"
+#include <common/playerstats.qh>
+#include <lib/csqcmodel/sv_model.qh>
 
-#include "../common/minigames/sv_minigames.qh"
+#include <common/minigames/sv_minigames.qh>
 
 #include <common/gamemodes/_mod.qh>
 
-#include "../common/physics/player.qh"
-#include "../common/effects/qc/_mod.qh"
-#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
-#include "../common/mapobjects/_mod.qh"
-#include "../common/wepent.qh"
+#include <common/physics/player.qh>
+#include <common/effects/qc/_mod.qh>
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
+#include <common/mapobjects/_mod.qh>
+#include <common/wepent.qh>
 
 #include "weapons/weaponstats.qh"
 #include <server/weapons/weaponsystem.qh>
 
-#include "../common/animdecide.qh"
+#include <common/animdecide.qh>
 
 void Drop_Special_Items(entity player)
 {
index 7abe6ae9786bd75941f6b927e214dacf80b6508e..2c5839175381f6e3edcfd67dbdf1f5c251dbadde 100644 (file)
@@ -5,20 +5,20 @@
 #include "mutators/_mod.qh"
 #include <server/client.qh>
 #include <server/weapons/common.qh>
-#include "../common/constants.qh"
-#include "../common/deathtypes/all.qh"
-#include "../common/notifications/all.qh"
-#include "../common/mapobjects/teleporters.qh"
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
+#include <common/notifications/all.qh>
+#include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/triggers.qh>
-#include "../common/mapobjects/subs.qh"
-#include "../common/util.qh"
+#include <common/mapobjects/subs.qh>
+#include <common/util.qh>
 #include <common/weapons/_all.qh>
-#include "../lib/csqcmodel/sv_model.qh"
-#include "../lib/warpzone/anglestransform.qh"
-#include "../lib/warpzone/util_server.qh"
-#include "../lib/warpzone/common.qh"
-#include "../common/vehicles/vehicle.qh"
-#include "../common/vehicles/sv_vehicles.qh"
+#include <lib/csqcmodel/sv_model.qh>
+#include <lib/warpzone/anglestransform.qh>
+#include <lib/warpzone/util_server.qh>
+#include <lib/warpzone/common.qh>
+#include <common/vehicles/vehicle.qh>
+#include <common/vehicles/sv_vehicles.qh>
 #include <common/weapons/weapon/porto.qh>
 #include <server/player.qh>
 #include <server/damage.qh>
index bc07efd5878f4e462b6ba6ba7248191efc4bc569..f7769e6ebbf1be3f59811c586eaf0d2b6df1c327 100644 (file)
 #include "spawnpoints.qh"
 #include "bot/api.qh"
 #include "command/getreplies.qh"
-#include "../common/deathtypes/all.qh"
-#include "../common/notifications/all.qh"
+#include <common/deathtypes/all.qh>
+#include <common/notifications/all.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/gamemodes/rules.qh>
 #include <common/net_linked.qh>
 #include <common/state.qh>
 #include <common/weapons/weapon/porto.qh>
-#include "../common/mapobjects/subs.qh"
+#include <common/mapobjects/subs.qh>
 #include <common/mapobjects/triggers.qh>
-#include "../lib/warpzone/util_server.qh"
-#include "../lib/warpzone/common.qh"
+#include <lib/warpzone/util_server.qh>
+#include <lib/warpzone/common.qh>
 #include <common/vehicles/sv_vehicles.qh>
-#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
 
 string uid2name(string myuid)
 {
index fa970f955e0d9fddf7f4af0b11c92dc46bd7047b..bc0b23b8fbf2a9751912244045c447220dad8408 100644 (file)
@@ -4,7 +4,7 @@
 #include "campaign.qh"
 #include "command/vote.qh"
 #include <common/mapobjects/triggers.qh>
-#include "../common/util.qh"
+#include <common/util.qh>
 
 void round_handler_Think(entity this)
 {
index 73d03ae785783edff94e790774314b69d9c59baf..10ffc9c7e864a014f93bba4e496699479403972c 100644 (file)
@@ -8,8 +8,8 @@
 #include <server/mutators/_mod.qh>
 #include <server/round_handler.qh>
 #include <common/net_linked.qh>
-#include "../common/playerstats.qh"
-#include "../common/teams.qh"
+#include <common/playerstats.qh>
+#include <common/teams.qh>
 #include <common/mapinfo.qh>
 #include <common/mutators/base.qh>
 #include <common/scores.qh>
index 4bcffe68a4c2b5a0a762edbafa7eb75eff3cd506..61969ae35b8d0641c874472a7503bb6ebae0e851 100644 (file)
@@ -5,16 +5,16 @@
 #include "race.qh"
 #include <common/weapons/_all.qh>
 #include <common/stats.qh>
-#include "../common/constants.qh"
+#include <common/constants.qh>
 #include <common/net_linked.qh>
-#include "../common/teams.qh"
+#include <common/teams.qh>
 #include <common/gamemodes/_mod.qh>
-#include "../common/mapobjects/subs.qh"
-#include "../common/mapobjects/target/spawnpoint.qh"
+#include <common/mapobjects/subs.qh>
+#include <common/mapobjects/target/spawnpoint.qh>
 #include <common/mapobjects/triggers.qh>
-#include "../common/util.qh"
-#include "../lib/warpzone/common.qh"
-#include "../lib/warpzone/util_server.qh"
+#include <common/util.qh>
+#include <lib/warpzone/common.qh>
+#include <lib/warpzone/util_server.qh>
 #include <server/intermission.qh>
 #include <server/utils.qh>
 #include <server/command/vote.qh>
index 1c436da9691b0d555225ef9453286dfab73b9212..118900398fe50418f3355336b369ecf474288624 100644 (file)
@@ -13,9 +13,9 @@
 
 #include <server/mutators/_mod.qh>
 
-#include "../common/deathtypes/all.qh"
+#include <common/deathtypes/all.qh>
 #include <common/gamemodes/_mod.qh>
-#include "../common/teams.qh"
+#include <common/teams.qh>
 
 /// \brief Describes a state of team balance entity.
 enum
index 88890fc2f9ad4d315f2856a1dd040a6beffea99a..de5e63e6bc8c6aed53f313e9ce955e7906966418 100644 (file)
 #include "teamplay.qh"
 #include "weapons/weaponstats.qh"
 #include <server/weapons/common.qh>
-#include "../common/constants.qh"
+#include <common/constants.qh>
 #include <common/net_linked.qh>
-#include "../common/deathtypes/all.qh"
+#include <common/deathtypes/all.qh>
 #include <common/gamemodes/_mod.qh>
-#include "../common/gamemodes/sv_rules.qh"
-#include "../common/mapinfo.qh"
-#include "../common/monsters/_mod.qh"
-#include "../common/monsters/sv_monsters.qh"
-#include "../common/vehicles/all.qh"
-#include "../common/notifications/all.qh"
-#include "../common/physics/player.qh"
-#include "../common/playerstats.qh"
-#include "../common/stats.qh"
-#include "../common/teams.qh"
+#include <common/gamemodes/sv_rules.qh>
+#include <common/mapinfo.qh>
+#include <common/monsters/_mod.qh>
+#include <common/monsters/sv_monsters.qh>
+#include <common/vehicles/all.qh>
+#include <common/notifications/all.qh>
+#include <common/physics/player.qh>
+#include <common/playerstats.qh>
+#include <common/stats.qh>
+#include <common/teams.qh>
 #include <common/mapobjects/triggers.qh>
 #include <common/mapobjects/trigger/hurt.qh>
-#include "../common/mapobjects/trigger/secret.qh"
-#include "../common/mapobjects/target/music.qh"
-#include "../common/util.qh"
-#include "../common/items/_mod.qh"
+#include <common/mapobjects/trigger/secret.qh>
+#include <common/mapobjects/target/music.qh>
+#include <common/util.qh>
+#include <common/items/_mod.qh>
 #include <common/weapons/_all.qh>
-#include "../common/state.qh"
+#include <common/state.qh>
 
 const float LATENCY_THINKRATE = 10;
 .float latency_sum;