Remove direct server #includes from client

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 5de03953cd4e4dc3a25c7a541a7dcc43c5f907e6..30231d1495420a3dbabcd86d404fc3dd044a79a3 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -2,9 +2,11 @@
 
 #include "autocvars.qh"
 #include "main.qh"
+
 #include "../common/notifications.qh"
 #include "../common/stats.qh"
 #include "../common/util.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 bool announcer_1min;

diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc
index 70c4bab3f14da153a90c12cff8e653084e4c2b2b..d88622070bc654d16c25fac27d2295c9d3e5008a 100644 (file)
--- a/qcsrc/client/bgmscript.qc
+++ b/qcsrc/client/bgmscript.qc
@@ -3,7 +3,9 @@
 #include "autocvars.qh"
 #include "defs.qh"
 #include "main.qh"
+
 #include "../common/util.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 #define CONSTANT_SPEED_DECAY

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index c80c9bc6a48bf04e19c8782d50f3c5df630a41ac..7dd79754cabd5d723a74a7faf6ff62f5df80cc45 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -6,6 +6,7 @@
 #include "movetypes.qh"
 #include "prandom.qh"
 #include "rubble.qh"
+
 #include "../common/util.qh"
 
 .float cnt;

diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index 5a69fbbd0378aec476262a5b9642a56cb7065fbd..d905ffc7f1c97ec959e52000935bc8aea0cd6ec7 100644 (file)
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -12,10 +12,11 @@
 #include "../main.qh"
 #include "../mapvoting.qh"
 #include "../miscfunctions.qh"
-#include "../scoreboard.qh"
+
+#include "../../common/mapinfo.qh"
+
 #include "../../common/command/generic.qh"
 #include "../../common/command/shared_defs.qh"
-#include "../../common/mapinfo.qh"
 
 void DrawDebugModel()
 {

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 2337266cf280838dd2421dbac1c8c7b2ca6cfcd5..5bef3cc9c9d67a81c11737961d9d58c2fb053f19 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -1,19 +1,23 @@
 #include "csqcmodel_hooks.qh"
 
+#include "autocvars.qh"
 #include "defs.qh"
 #include "gibs.qh"
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "player_skeleton.qh"
 #include "sortlist.qh"
-#include "../client/autocvars.qh"
-#include "../client/weapons/projectile.qh"
+
+#include "weapons/projectile.qh"
+
 #include "../common/animdecide.qh"
 #include "../common/csqcmodel_settings.qh"
 #include "../common/teams.qh"
+
 #include "../csqcmodellib/cl_model.qh"
 #include "../csqcmodellib/cl_player.qh"
 #include "../csqcmodellib/interpolate.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 .float death_time;

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index c962777c91d2ae434fcc944f9feeaf527fddd381..6826b03ce39f8aaa2c72e8db52de79c8a5cbf741 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -5,11 +5,15 @@
 #include "gibs.qh"
 #include "movetypes.qh"
 #include "prandom.qh"
+
 #include "vehicles/vehicles.qh"
+
 #include "../common/constants.qh"
 #include "../common/deathtypes.qh"
 #include "../common/util.qh"
+
 #include "../common/weapons/weapons.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 .entity tag_entity;

diff --git a/qcsrc/client/effects.qc b/qcsrc/client/effects.qc
index aa34ae22ed4ac677fd1c8f0f21cabc934aa11c03..077c36a2ac736797ee1bb62fcf75826ba41212fd 100644 (file)
--- a/qcsrc/client/effects.qc
+++ b/qcsrc/client/effects.qc
@@ -1,6 +1,7 @@
 #include "effects.qh"
 
 #include "autocvars.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 /*

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index 8247f6a28c9f1b1c7d7b4dd3268bc301eee1ebcd..efdcd2e56e360efa7fce1c6bd33a263fcb5a5f25 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -6,6 +6,7 @@
 #include "movetypes.qh"
 #include "prandom.qh"
 #include "rubble.qh"
+
 #include "../common/constants.qh"
 #include "../common/util.qh"
 

diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index 0631de62652823b7410222d661d5065ae84f1d67..5d8394cd0b0e4423e3fdba009976b2003b6d3057 100644 (file)
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -6,8 +6,11 @@
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "noise.qh"
+
 #include "../common/teams.qh"
+
 #include "../csqcmodellib/interpolate.qh"
+
 #include "../warpzonelib/common.qh"
 #include "../warpzonelib/mathlib.qh"
 

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 5a6a137375c468abfa83e092565addda636393b0..0053541b1fa7feb47bda0b955a6ba053a5369317 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -8,6 +8,8 @@
 #include "scoreboard.qh"
 #include "sortlist.qh"
 #include "teamradar.qh"
+#include "t_items.qh"
+
 #include "../common/buffs.qh"
 #include "../common/constants.qh"
 #include "../common/counting.qh"
@@ -15,8 +17,9 @@
 #include "../common/mapinfo.qh"
 #include "../common/nades.qh"
 #include "../common/stats.qh"
+
 #include "../csqcmodellib/cl_player.qh"
-#include "../server/t_items.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 /*

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 6a66edfb22243d10d58450baaef548039b7cbe86..f6c3f53a7c2c95e598dd61390675ac6350c053a2 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -4,7 +4,9 @@
 #include "defs.qh"
 #include "hud.qh"
 #include "miscfunctions.qh"
+
 #include "../common/constants.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 #include "../dpdefs/keycodes.qh"
 

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index f3d60d54c874fb193ab5581b420a013c89242b3d..f0a9a459468c69fb07012b8e9d18d21484dd5a73 100644 (file)
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -2,9 +2,12 @@
 
 #include "hook.qh"
 #include "main.qh"
+
 #include "../common/buffs.qh"
+
 #include "../csqcmodellib/cl_model.qh"
 #include "../csqcmodellib/interpolate.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index f16e85ecc36f3d71581413f6397cd9ebad393ad0..5eafa68faf946fd7c79cef11007a91aef6bb3559 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -21,10 +21,15 @@
 #include "target_music.qh"
 #include "tturrets.qh"
 #include "tuba.qh"
-#include "vehicles/vehicles.qh"
+#include "t_items.qh"
 #include "wall.qh"
 #include "waypointsprites.qh"
+
+#include "vehicles/bumblebee.qh"
+#include "vehicles/vehicles.qh"
+
 #include "weapons/projectile.qh"
+
 #include "../common/buffs.qh"
 #include "../common/deathtypes.qh"
 #include "../common/mapinfo.qh"
@@ -34,11 +39,12 @@
 #include "../common/notifications.qh"
 #include "../common/stats.qh"
 #include "../common/teams.qh"
+
 #include "../common/weapons/weapons.qh"
+
 #include "../csqcmodellib/cl_model.qh"
 #include "../csqcmodellib/interpolate.qh"
-#include "../server/t_items.qh"
-#include "../server/vehicles/bumblebee.qh"
+
 #include "../warpzonelib/client.qh"
 
 // --------------------------------------------------------------------------

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 9b2191bc4ef86ac6db9c082b49837bbff80b0b6d..e0f8b0d2345c8f71ad6d1d2e92f0bea8bce80d1d 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -6,8 +6,10 @@
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "scoreboard.qh"
+
 #include "../common/mapinfo.qh"
 #include "../common/util.qh"
+
 #include "../dpdefs/keycodes.qh"
 
 string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, vector fontsize)

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index d6aa38e04358323f6ac4caf3f9e5f6bef65c6af1..ae88b424b79f949e687612d5487bfce4e2194e98 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -5,11 +5,15 @@
 #include "hud.qh"
 #include "main.qh"
 #include "sortlist.qh"
+
 #include "../common/command/generic.qh"
+
 #include "../common/teams.qh"
 #include "../common/urllib.qh"
 #include "../common/util.qh"
+
 #include "../csqcmodellib/cl_model.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 void AuditLists()

diff --git a/qcsrc/client/movelib.qc b/qcsrc/client/movelib.qc
new file mode 100644 (file)
index 0000000..074f146
--- /dev/null
+++ b/qcsrc/client/movelib.qc
@@ -0,0 +1 @@
+#include "../server/movelib.qc"

diff --git a/qcsrc/client/movelib.qh b/qcsrc/client/movelib.qh
new file mode 100644 (file)
index 0000000..a0634f6
--- /dev/null
+++ b/qcsrc/client/movelib.qh
@@ -0,0 +1 @@
+#include "../server/movelib.qh"

diff --git a/qcsrc/client/movetypes.qc b/qcsrc/client/movetypes.qc
index 6ffba0f13cc69d98f23c96e043f89c235bdd8b58..88b5494149e50f80953e403b2b27c3e67a249dee 100644 (file)
--- a/qcsrc/client/movetypes.qc
+++ b/qcsrc/client/movetypes.qc
@@ -1,11 +1,15 @@
 #include "movetypes.qh"
 
 #include "defs.qh"
+#include "t_items.qh"
+
 #include "../common/stats.qh"
 #include "../common/util.qh"
+
 #include "../csqcmodellib/common.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
-#include "../server/t_items.qh"
+
 
 
 const int MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE = 4;

diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc
index 334487c6bab0c15b6cf956b0b6b3f0f3316922dd..24c01ce30313b3f06013e430148c9ae4ca8cfcf2 100644 (file)
--- a/qcsrc/client/particles.qc
+++ b/qcsrc/client/particles.qc
@@ -3,8 +3,10 @@
 #include "autocvars.qh"
 #include "bgmscript.qh"
 #include "main.qh"
+
 #include "../common/stats.qh"
 #include "../common/util.qh"
+
 #include "../warpzonelib/common.qh"
 
 void Draw_PointParticles()

diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index 74064c7ecbaf8802093a923dc2ad5498cd712e95..9df837229692bace30366a8becff7470e79c9e32 100644 (file)
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -1,6 +1,7 @@
 #include "player_skeleton.qh"
 
 #include "../common/csqcmodel_settings.qh"
+
 #include "../warpzonelib/anglestransform.qh"
 
 class(Skeleton) .float skeleton_info_modelindex;

diff --git a/qcsrc/client/prandom.qc b/qcsrc/client/prandom.qc
index 181300934e1459e77b43c1a3c83f74d6997549ac..3262488617108530df75b09cbe75f6e40a5239de 100644 (file)
--- a/qcsrc/client/prandom.qc
+++ b/qcsrc/client/prandom.qc
@@ -1,6 +1,7 @@
 #include "prandom.qh"
 
 #include "../dpdefs/csprogsdefs.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 // prandom - PREDICTABLE random number generator (not seeded yet)

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 7ca2e54c4dc019add35453a95dd5f40c8a1dc20b..c66554aa46a781762ccd08051dc1f56f0826bb0e 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -18,6 +18,7 @@ main.qc
 mapvoting.qc
 miscfunctions.qc
 modeleffects.qc
+movelib.qc
 movetypes.qc
 noise.qc
 particles.qc
@@ -31,13 +32,16 @@ target_music.qc
 teamradar.qc
 tturrets.qc
 tuba.qc
-vehicles/vehicles.qc
+t_items.qc
 view.qc
 wall.qc
 waypointsprites.qc
 
 command/cl_cmd.qc
 
+vehicles/bumblebee.qc
+vehicles/vehicles.qc
+
 weapons/projectile.qc // TODO
 
 ../common/animdecide.qc
@@ -63,10 +67,6 @@ weapons/projectile.qc // TODO
 ../csqcmodellib/cl_player.qc
 ../csqcmodellib/interpolate.qc
 
-../server/movelib.qc
-../server/t_items.qc
-../server/vehicles/bumblebee.qc
-
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/client.qc
 ../warpzonelib/common.qc

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index e31656ac20588074dfe12eb04cf788f10eeb1eb0..da947cc1348bbc4fa751d7cac3f1ea7ef9217f13 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -6,6 +6,7 @@
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "sortlist.qh"
+
 #include "../common/constants.qh"
 #include "../common/counting.qh"
 #include "../common/mapinfo.qh"

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 28b04b1d2ec7ccbba12bfa85c9494b7bdc10d96d..0ee3e512a3cc62635fe9c39858977dbfac43149d 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -5,11 +5,14 @@
 #include "hud.qh"
 #include "main.qh"
 #include "miscfunctions.qh"
+
 #include "../common/constants.qh"
 #include "../common/mapinfo.qh"
 #include "../common/teams.qh"
 #include "../common/util.qh"
+
 #include "../csqcmodellib/cl_model.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 

diff --git a/qcsrc/client/t_items.qc b/qcsrc/client/t_items.qc
new file mode 100644 (file)
index 0000000..c319467
--- /dev/null
+++ b/qcsrc/client/t_items.qc
@@ -0,0 +1,11 @@
+#include "autocvars.qh"
+#include "main.qh"
+#include "movetypes.qh"
+#include "../common/buffs.qh"
+#include "../common/util.qh"
+#include "../common/weapons/weapons.qh"
+#include "../csqcmodellib/cl_model.qh"
+#include "../csqcmodellib/common.qh"
+#include "../dpdefs/csprogsdefs.qh"
+
+#include "../server/t_items.qc"

diff --git a/qcsrc/client/t_items.qh b/qcsrc/client/t_items.qh
new file mode 100644 (file)
index 0000000..eb01624
--- /dev/null
+++ b/qcsrc/client/t_items.qh
@@ -0,0 +1 @@
+#include "../server/t_items.qh"

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 25ce2deb53d019c7607bafef456ee02abb47dbf9..d72567cab88da008b1b6069b6264feb23d93de19 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -3,8 +3,10 @@
 #include "autocvars.qh"
 #include "defs.qh"
 #include "main.qh"
+
 #include "../common/constants.qh"
 #include "../common/util.qh"
+
 #include "../warpzonelib/common.qh"
 
 .string noise;

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 3ea3a757c3d6eaf76ac62e59386928e9f8ea63da..2d7c327023142ca6ea68e7f9c02bee64c721cc01 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -5,7 +5,9 @@
 #include "hud.qh"
 #include "main.qh"
 #include "miscfunctions.qh"
+
 #include "../common/util.qh"
+
 #include "../csqcmodellib/interpolate.qh"
 
 float vlen2d(vector v)

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 22bacdcac767e6e8315a65139d3f224b2a0b2445..bcff5ede1565903ea8344ad61430e545d9750a50 100644 (file)
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -5,12 +5,16 @@
 #include "hud.qh"
 #include "main.qh"
 #include "miscfunctions.qh"
+#include "movelib.qh"
 #include "movetypes.qh"
 #include "prandom.qh"
 #include "teamradar.qh"
 #include "waypointsprites.qh"
+
 #include "../common/teams.qh"
-#include "../server/movelib.qh"
+
+#include "../server/tturrets/include/turrets_early.qh"
+
 #include "../warpzonelib/anglestransform.qh"
 #include "../warpzonelib/mathlib.qh"
 

diff --git a/qcsrc/client/tturrets.qh b/qcsrc/client/tturrets.qh
index ab651e2fa914bce8c23d0fb69918a57f738c4fe1..bf73dc82be3dafe3cce0147abb5761eb66feddd5 100644 (file)
--- a/qcsrc/client/tturrets.qh
+++ b/qcsrc/client/tturrets.qh
@@ -1,8 +1,6 @@
 #ifndef TTURRETS_H
 #define TTURRETS_H
 
-#include "../server/tturrets/include/turrets_early.qh"
-
 void ent_turret();
 void turrets_precache();
 entityclass(Turret)

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 93a7a8954356c526014e20aa55ac07a1103e79b8..aa20b3508a1a58602f9a7187908feb026dbe876f 100644 (file)
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -2,8 +2,10 @@
 
 #include "autocvars.qh"
 #include "main.qh"
+
 #include "../common/constants.qh"
 #include "../common/util.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 #define TUBA_STARTNOTE(i, n) strcat("weapons/tuba", (i ? ftos(i) : ""), "_loopnote", ftos(n), ".wav")

diff --git a/qcsrc/client/vehicles/bumblebee.qc b/qcsrc/client/vehicles/bumblebee.qc
new file mode 100644 (file)
index 0000000..7bfe316
--- /dev/null
+++ b/qcsrc/client/vehicles/bumblebee.qc
@@ -0,0 +1 @@
+#include "../../server/vehicles/bumblebee.qc"

diff --git a/qcsrc/client/vehicles/bumblebee.qh b/qcsrc/client/vehicles/bumblebee.qh
new file mode 100644 (file)
index 0000000..411eb36
--- /dev/null
+++ b/qcsrc/client/vehicles/bumblebee.qh
@@ -0,0 +1 @@
+#include "../../server/vehicles/bumblebee.qh"

diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc
index 1cc907296980976bdfdcdd51287cfec7c029edd9..db1df041deb72508d134d4f9570745aac5b860a0 100644 (file)
--- a/qcsrc/client/vehicles/vehicles.qc
+++ b/qcsrc/client/vehicles/vehicles.qc
@@ -8,13 +8,16 @@
 #include "../movetypes.qh"
 #include "../prandom.qh"
 #include "../scoreboard.qh"
+#include "../t_items.qh"
+
 #include "../../common/buffs.qh"
 #include "../../common/constants.qh"
 #include "../../common/stats.qh"
 #include "../../common/util.qh"
+
 #include "../../csqcmodellib/cl_model.qh"
+
 #include "../../dpdefs/csprogsdefs.qh"
-#include "../../server/t_items.qh"
 
 .float cnt;
 

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 8167cb1bd9709ceb017b3e78c5550a030f24e0f4..1a75fa0ef1015638d2be3f9845d674b87d71b8e4 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -13,15 +13,20 @@
 #include "target_music.qh"
 #include "vehicles/vehicles.qh"
 #include "waypointsprites.qh"
+
 #include "../common/constants.qh"
 #include "../common/mapinfo.qh"
 #include "../common/nades.qh"
 #include "../common/stats.qh"
 #include "../common/teams.qh"
 #include "../common/util.qh"
+
 #include "../common/weapons/weapons.qh"
+
 #include "../csqcmodellib/cl_player.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
+
 #include "../warpzonelib/client.qh"
 #include "../warpzonelib/common.qh"
 #include "../warpzonelib/mathlib.qh"

diff --git a/qcsrc/client/wall.qc b/qcsrc/client/wall.qc
index 11b851f8a70e6b395f439f9acfd7e2fe9cd0e908..98a2318d7b74de9d4a3dc9f31e3907ec18dc8c89 100644 (file)
--- a/qcsrc/client/wall.qc
+++ b/qcsrc/client/wall.qc
@@ -3,7 +3,9 @@
 #include "autocvars.qh"
 #include "bgmscript.qh"
 #include "main.qh"
+
 #include "../common/util.qh"
+
 #include "../csqcmodellib/interpolate.qh"
 
 .float alpha;

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index c26f42af42355ac724b55d0b19a61a3a31653353..34c1d08985dd93233ad95801eab5d0e3a04dbaf8 100644 (file)
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -6,11 +6,15 @@
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "teamradar.qh"
+
 #include "../common/buffs.qh"
 #include "../common/constants.qh"
 #include "../common/teams.qh"
+
 #include "../common/weapons/weapons.qh"
+
 #include "../csqcmodellib/interpolate.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 .float alpha;

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 0da47f97b22c13d636b2a28552afbd72f3496138..cd4f9b7441aee5483e0e9207591c8fb8cbe8912a 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -4,10 +4,13 @@
 #include "../defs.qh"
 #include "../main.qh"
 #include "../movetypes.qh"
+
 #include "../../common/constants.qh"
 #include "../../common/nades.qh"
 #include "../../common/util.qh"
+
 #include "../../csqcmodellib/interpolate.qh"
+
 #include "../../warpzonelib/anglestransform.qh"
 
 .float alpha;

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 347a85204c1c420a394a156538f42581e2f083fa..f05df2886a5509d19fbafc98d5b09fbfdeee3591 100644 (file)
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -1,4 +1,5 @@
 #include "havocbot.qh"
+
 #include "role_onslaught.qc"
 #include "role_keyhunt.qc"
 #include "roles.qc"

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 1a4a7586c6f0ab8a99233ea255977f0c137c740c..8a5ac17b1a1d73cdc699b4d367673232012e5dc5 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -1,31 +1,27 @@
-#if defined(CSQC)
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../common/util.qh"
-    #include "../common/buffs.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../client/autocvars.qh"
-    #include "../client/movetypes.qh"
-    #include "../client/main.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/cl_model.qh"
-    #include "t_items.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../common/constants.qh"
-    #include "../common/util.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
+#include "t_items.qh"
+
+#if defined(SVQC)
     #include "autocvars.qh"
     #include "constants.qh"
     #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
+
     #include "mutators/mutators_include.qh"
+
+    #include "weapons/weaponsystem.qh"
+
+    #include "../common/constants.qh"
+    #include "../common/deathtypes.qh"
+    #include "../common/notifications.qh"
+    #include "../common/util.qh"
+
+    #include "../common/monsters/monsters.qh"
+
+    #include "../common/weapons/weapons.qh"
+
+    #include "../dpdefs/dpextensions.qh"
+    #include "../dpdefs/progsdefs.qh"
+
+    #include "../warpzonelib/util_server.qh"
 #endif
 
 #ifdef CSQC

diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index dce126c0e986148bc86daecd99fd4ab25ff8cb31..b96419584b50f2924cc11b501f85d42847006549 100644 (file)
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -1,5 +1,4 @@
-const vector RACER_MIN = '-120 -120 -40';
-const vector RACER_MAX = '120 120 40';
+#include "racer.qh"
 
 #ifdef SVQC
 void racer_exit(float eject);
@@ -680,4 +679,4 @@ void spawnfunc_vehicle_racer()
         return;
     }
 }
-#endif // SVQC
\ No newline at end of file
+#endif // SVQC

diff --git a/qcsrc/server/vehicles/racer.qh b/qcsrc/server/vehicles/racer.qh
new file mode 100644 (file)
index 0000000..0051b77
--- /dev/null
+++ b/qcsrc/server/vehicles/racer.qh
@@ -0,0 +1,5 @@
+#ifndef RACER_H
+#define RACER_H
+const vector RACER_MIN = '-120 -120 -40';
+const vector RACER_MAX = '120 120 40';
+#endif

diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index 4bd28369342b27bf629d165d7b476c203d2833bb..74d3c7a6896a975cfc3358dc1d7417198c08b030 100644 (file)
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -1,10 +1,4 @@
-const float RSM_FIRST = 0;
-const float RSM_BOMB = 0;
-const float RSM_FLARE = 1;
-const float RSM_LAST = 1;
-
-const vector RAPTOR_MIN = '-80 -80 0';
-const vector RAPTOR_MAX = '80 80 70';
+#include "raptor.qh"
 
 #ifdef SVQC
 float autocvar_g_vehicle_raptor;

diff --git a/qcsrc/server/vehicles/raptor.qh b/qcsrc/server/vehicles/raptor.qh
new file mode 100644 (file)
index 0000000..0043789
--- /dev/null
+++ b/qcsrc/server/vehicles/raptor.qh
@@ -0,0 +1,11 @@
+#ifndef RAPTOR_H
+#define RAPTOR_H
+const float RSM_FIRST = 0;
+const float RSM_BOMB = 0;
+const float RSM_FLARE = 1;
+const float RSM_LAST = 1;
+
+const vector RAPTOR_MIN = '-80 -80 0';
+const vector RAPTOR_MAX = '80 80 70';
+
+#endif

diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index c969e225ebc3bc21a3d504dfa7c80c9f465c6700..10ab353ec867b6000ab7594b7397ff65d47e528b 100644 (file)
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -1,5 +1,4 @@
-const vector SPIDERBOT_MIN = '-75 -75 10';
-const vector SPIDERBOT_MAX  = '75 75 125';
+#include "spiderbot.qh"
 
 #ifdef SVQC
 float autocvar_g_vehicle_spiderbot;

diff --git a/qcsrc/server/vehicles/spiderbot.qh b/qcsrc/server/vehicles/spiderbot.qh
new file mode 100644 (file)
index 0000000..ce96858
--- /dev/null
+++ b/qcsrc/server/vehicles/spiderbot.qh
@@ -0,0 +1,5 @@
+#ifndef SPIDERBOT_H
+#define SPIDERBOT_H
+const vector SPIDERBOT_MIN = '-75 -75 10';
+const vector SPIDERBOT_MAX  = '75 75 125';
+#endif

diff --git a/qcsrc/server/vehicles/vehicles.qh b/qcsrc/server/vehicles/vehicles.qh
index e6b976096dc30d6dfa72dd807649864f9e8f6c2b..ec152d7f7b6065b9365764dc30bc66c678102363 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qh
+++ b/qcsrc/server/vehicles/vehicles.qh
@@ -2,13 +2,15 @@
 #define VEHICLES_H
 
 #ifdef VEHICLES_ENABLED
-#include "vehicles.qc"
+#   include "vehicles.qc"
 
-#include "racer.qc"
-#include "spiderbot.qc"
-#include "raptor.qc"
-#ifndef VEHICLES_NO_UNSTABLE
-#include "bumblebee.qc"
-#endif
+#   include "racer.qc"
+#   include "raptor.qc"
+#   include "spiderbot.qc"
+
+#   ifndef VEHICLES_NO_UNSTABLE
+#       include "bumblebee.qc"
+#   endif
 #endif
+
 #endif

diff --git a/qcsrc/test/compilationunit.sh b/qcsrc/test/compilationunit.sh
index fb893848f529de814751cd43932cf9d4294f401f..7af726f4c8dec00182a6ea83c46cf958d10113f7 100755 (executable)
--- a/qcsrc/test/compilationunit.sh
+++ b/qcsrc/test/compilationunit.sh
@@ -15,4 +15,10 @@ function check() {
 }
 
 clientdefs=("-DCSQC" "common/util-pre.qh" "dpdefs/csprogsdefs.qh")
-check client clientdefs[@]
+check "client" clientdefs[@]
+
+# serverdefs=("-DSVQC" "common/util-pre.qh" "server/sys-pre.qh" "dpdefs/progsdefs.qh" "dpdefs/dpextensions.qh" "server/sys-post.qh" "server/defs.qh" "server/autocvars.qh")
+# check "server" serverdefs[@]
+
+# menudefs=("-DMENUQC" "common/util-pre.qh" "dpdefs/menudefs.qh" "menu/oo/interface.qc" "menu/oo/implementation.qc")
+# check "menu" menudefs[@]

diff --git a/qcsrc/warpzonelib/anglestransform.qc b/qcsrc/warpzonelib/anglestransform.qc
index e8a455b6ee25548bf67e22c68c15fd3e1626089d..079ceaa7d1a5577a4e5326b873da4788842430b0 100644 (file)
--- a/qcsrc/warpzonelib/anglestransform.qc
+++ b/qcsrc/warpzonelib/anglestransform.qc
@@ -1,11 +1,11 @@
+#include "anglestransform.qh"
+
 #if defined(CSQC)
        #include "../dpdefs/csprogsdefs.qh"
-       #include "anglestransform.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
        #include "../dpdefs/progsdefs.qh"
     #include "../dpdefs/dpextensions.qh"
-    #include "anglestransform.qh"
 #endif
 
 #ifdef POSITIVE_PITCH_IS_DOWN

diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index 5c2609a7dfbd388d8cb1b1172974b74fd8dbbd5a..e0bb6434584efb034b554b9985febc3ff39a8280 100644 (file)
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -1,9 +1,10 @@
+#include "client.qh"
+#include "common.qh"
+
 #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "common.qh"
-       #include "client.qh"
        #include "../client/autocvars.qh"
        #include "../csqcmodellib/cl_model.qh"
+       #include "../dpdefs/csprogsdefs.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
 #endif

diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc
index aa0de911963a9bc700e6aa3167b2181633d7b7b6..0734811c181108981470782c4fe31fd929c15188 100644 (file)
--- a/qcsrc/warpzonelib/common.qc
+++ b/qcsrc/warpzonelib/common.qc
@@ -1,13 +1,13 @@
+#include "common.qh"
+
 #if defined(CSQC)
        #include "../dpdefs/csprogsdefs.qh"
-    #include "common.qh"
     #include "../server/t_items.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "common.qh"
     #include "../common/weapons/weapons.qh"
+    #include "../dpdefs/dpextensions.qh"
+       #include "../dpdefs/progsdefs.qh"
 #endif
 
 void WarpZone_Accumulator_Clear(entity acc)

diff --git a/qcsrc/warpzonelib/mathlib.qc b/qcsrc/warpzonelib/mathlib.qc
index c9cde9072c34210fb2f387f137569dfa35f71d9e..395547036ceb8fa24e6045f3d1aec5b4cb4f8c6a 100644 (file)
--- a/qcsrc/warpzonelib/mathlib.qc
+++ b/qcsrc/warpzonelib/mathlib.qc
@@ -1,11 +1,10 @@
+#include "mathlib.qh"
 #if defined(CSQC)
        #include "../dpdefs/csprogsdefs.qh"
-    #include "mathlib.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
     #include "../dpdefs/dpextensions.qh"
-    #include "mathlib.qh"
+       #include "../dpdefs/progsdefs.qh"
 #endif
 
 int fpclassify(float x)

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index a9380070b7f7f77d57bca408ad03ba5c648bcc0d..bd6266ea0ca008f8141244638a2bd1ee4b6043e5 100644 (file)
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -1,15 +1,16 @@
+#include "server.qh"
+
+#include "common.qh"
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-       #include "../dpdefs/dpextensions.qh"
-       #include "common.qh"
-       #include "server.qh"
        #include "../common/constants.qh"
        #include "../common/util.qh"
+       #include "../dpdefs/dpextensions.qh"
+       #include "../dpdefs/progsdefs.qh"
+       #include "../server/command/common.qh"
        #include "../server/constants.qh"
        #include "../server/defs.qh"
-       #include "../server/command/common.qh"
 #endif
 
 #ifdef WARPZONELIB_KEEPDEBUG

diff --git a/qcsrc/warpzonelib/util_server.qc b/qcsrc/warpzonelib/util_server.qc
index b94eafbdafd4e422af7dd6eb5c31933156dbb988..e82c4ba6e212b41a25714f457448382ca4b95cb8 100644 (file)
--- a/qcsrc/warpzonelib/util_server.qc
+++ b/qcsrc/warpzonelib/util_server.qc
@@ -1,11 +1,13 @@
+#include "util_server.qh"
+
+#include "common.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "common.qh"
-    #include "util_server.qh"
     #include "../csqcmodellib/sv_model.qh"
+    #include "../dpdefs/dpextensions.qh"
+       #include "../dpdefs/progsdefs.qh"
 #endif
 
 void WarpZoneLib_MoveOutOfSolid_Expand(entity e, vector by)