Create common client header

diff --git a/qcsrc/client/_.qh b/qcsrc/client/_.qh
new file mode 100644 (file)
index 0000000..8b811bc
--- /dev/null
+++ b/qcsrc/client/_.qh
@@ -0,0 +1,11 @@
+#ifndef __H
+#define __H
+
+#include "autocvars.qh"
+#include "defs.qh"
+#include "main.qh"
+#include "miscfunctions.qh"
+
+#include "../dpdefs/csprogsdefs.qh"
+
+#endif

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 30231d1495420a3dbabcd86d404fc3dd044a79a3..ad61ea1586fb9bf357475f81ccc99de91d49f51f 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,14 +1,10 @@
 #include "announcer.qh"
-
-#include "autocvars.qh"
-#include "main.qh"
+#include "_.qh"
 
 #include "../common/notifications.qh"
 #include "../common/stats.qh"
 #include "../common/util.qh"
 
-#include "../dpdefs/csprogsdefs.qh"
-
 bool announcer_1min;
 bool announcer_5min;
 void Announcer_Countdown()

diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc
index d88622070bc654d16c25fac27d2295c9d3e5008a..eeba139c551b4d57aa80776ce6126feee1a7e292 100644 (file)
--- a/qcsrc/client/bgmscript.qc
+++ b/qcsrc/client/bgmscript.qc
@@ -1,13 +1,8 @@
 #include "bgmscript.qh"
-
-#include "autocvars.qh"
-#include "defs.qh"
-#include "main.qh"
+#include "_.qh"
 
 #include "../common/util.qh"
 
-#include "../dpdefs/csprogsdefs.qh"
-
 #define CONSTANT_SPEED_DECAY
 
 float bgmscriptbuf;

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index 7dd79754cabd5d723a74a7faf6ff62f5df80cc45..28a8390b0d4c9c4c72caf3de9bc43093c33f287b 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -1,8 +1,6 @@
 #include "casings.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
-#include "main.qh"
 #include "movetypes.qh"
 #include "prandom.qh"
 #include "rubble.qh"

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 5bef3cc9c9d67a81c11737961d9d58c2fb053f19..44a4fa532815508cb63d90a60eaf19ddfabdddd8 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -1,10 +1,7 @@
 #include "csqcmodel_hooks.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "gibs.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
 #include "player_skeleton.qh"
 #include "sortlist.qh"
 

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 6826b03ce39f8aaa2c72e8db52de79c8a5cbf741..e523f4f4259bda1cda356877775b2f878e06c6c1 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -1,7 +1,6 @@
 #include "damage.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "gibs.qh"
 #include "movetypes.qh"
 #include "prandom.qh"
@@ -14,8 +13,6 @@
 
 #include "../common/weapons/weapons.qh"
 
-#include "../dpdefs/csprogsdefs.qh"
-
 .entity tag_entity;
 
 .float cnt;

diff --git a/qcsrc/client/effects.qc b/qcsrc/client/effects.qc
index 077c36a2ac736797ee1bb62fcf75826ba41212fd..de51aa3e1683745d95ca45f736d03b6146ef0386 100644 (file)
--- a/qcsrc/client/effects.qc
+++ b/qcsrc/client/effects.qc
@@ -1,8 +1,5 @@
 #include "effects.qh"
-
-#include "autocvars.qh"
-
-#include "../dpdefs/csprogsdefs.qh"
+#include "_.qh"
 
 /*
 .vector fx_start;

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index efdcd2e56e360efa7fce1c6bd33a263fcb5a5f25..e0fec0e60baed9907ed36bdf4e8e45aa75a0324c 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -1,8 +1,6 @@
 #include "gibs.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
-#include "main.qh"
 #include "movetypes.qh"
 #include "prandom.qh"
 #include "rubble.qh"

diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index 5d8394cd0b0e4423e3fdba009976b2003b6d3057..27351d455c1aff12be53269f81629d3cd91f1463 100644 (file)
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -1,10 +1,7 @@
 #include "hook.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hud.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
 #include "noise.qh"
 
 #include "../common/teams.qh"

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 0053541b1fa7feb47bda0b955a6ba053a5369317..b76fbc375e13c831689815d177468c42bb9b667d 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1,10 +1,7 @@
 #include "hud.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hud_config.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
 #include "scoreboard.qh"
 #include "sortlist.qh"
 #include "teamradar.qh"

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index f6c3f53a7c2c95e598dd61390675ac6350c053a2..5c2779e1dcda9b2e6b33ca6c1a7802b8ffc9d78e 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -1,13 +1,10 @@
 #include "hud_config.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#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 f0a9a459468c69fb07012b8e9d18d21484dd5a73..1d5362903a38d70c576bc9e7dd9f0de7b535ede3 100644 (file)
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -1,16 +1,13 @@
 #include "laser.qh"
+#include "_.qh"
 
 #include "hook.qh"
-#include "main.qh"
 
 #include "../common/buffs.qh"
 
 #include "../csqcmodellib/cl_model.qh"
 #include "../csqcmodellib/interpolate.qh"
 
-#include "../dpdefs/csprogsdefs.qh"
-
-
 // a laser goes from origin in direction angles
 // it has color 'colormod'
 // and stops when something is in the way

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 5eafa68faf946fd7c79cef11007a91aef6bb3559..a74a4bf1b4437d71fa069f6df985092ea33076b0 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1,9 +1,9 @@
 #include "main.qh"
+#include "_.qh"
 
 #include "casings.qh"
 #include "csqcmodel_hooks.qh"
 #include "damage.qh"
-#include "defs.qh"
 #include "effects.qh"
 #include "gibs.qh"
 #include "hook.qh"
@@ -11,7 +11,6 @@
 #include "hud_config.qh"
 #include "laser.qh"
 #include "mapvoting.qh"
-#include "miscfunctions.qh"
 #include "modeleffects.qh"
 #include "particles.qh"
 #include "prandom.qh"

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index e0f8b0d2345c8f71ad6d1d2e92f0bea8bce80d1d..588ed534e3aef086c0e9235b5dd5f8cf2048383e 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -1,10 +1,7 @@
 #include "mapvoting.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hud.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
 #include "scoreboard.qh"
 
 #include "../common/mapinfo.qh"

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index ae88b424b79f949e687612d5487bfce4e2194e98..be7ea0e3f9f853b14363ce69457db56a5958e55f 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -1,9 +1,7 @@
 #include "miscfunctions.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hud.qh"
-#include "main.qh"
 #include "sortlist.qh"
 
 #include "../common/command/generic.qh"

diff --git a/qcsrc/client/modeleffects.qc b/qcsrc/client/modeleffects.qc
index 1eea25d8fcdd0d038c4ea46f7dddb464c1994823..692e684d204c3336225ca644866df55c58b52859 100644 (file)
--- a/qcsrc/client/modeleffects.qc
+++ b/qcsrc/client/modeleffects.qc
@@ -1,7 +1,5 @@
 #include "modeleffects.qh"
-
-#include "defs.qh"
-#include "main.qh"
+#include "_.qh"
 
 .float cnt;
 .float scale;

diff --git a/qcsrc/client/movetypes.qc b/qcsrc/client/movetypes.qc
index 88b5494149e50f80953e403b2b27c3e67a249dee..c26eac663f2fa8abac6f298b304d27b2a5219285 100644 (file)
--- a/qcsrc/client/movetypes.qc
+++ b/qcsrc/client/movetypes.qc
@@ -1,6 +1,6 @@
 #include "movetypes.qh"
+#include "_.qh"
 
-#include "defs.qh"
 #include "t_items.qh"
 
 #include "../common/stats.qh"
@@ -8,9 +8,6 @@
 
 #include "../csqcmodellib/common.qh"
 
-#include "../dpdefs/csprogsdefs.qh"
-
-
 
 const int MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE = 4;
 #define GRAVITY_UNAFFECTED_BY_TICRATE (getstati(STAT_MOVEFLAGS) & MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE)

diff --git a/qcsrc/client/noise.qc b/qcsrc/client/noise.qc
index 1896801fb5ceff8056b47a4ee9d895a214fd3c65..450d88b363d68b9b23100fc37607b438bfc8513f 100644 (file)
--- a/qcsrc/client/noise.qc
+++ b/qcsrc/client/noise.qc
@@ -1,10 +1,5 @@
 #include "noise.qh"
-
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "_.qh"
 
 entityclass(Noise)
 class(Noise) .float noise_baccum;

diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc
index 24c01ce30313b3f06013e430148c9ae4ca8cfcf2..aad855091d9ffd5ccf12e0664071c98d762b52c5 100644 (file)
--- a/qcsrc/client/particles.qc
+++ b/qcsrc/client/particles.qc
@@ -1,8 +1,7 @@
 #include "particles.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
 #include "bgmscript.qh"
-#include "main.qh"
 
 #include "../common/stats.qh"
 #include "../common/util.qh"

diff --git a/qcsrc/client/prandom.qc b/qcsrc/client/prandom.qc
index 3262488617108530df75b09cbe75f6e40a5239de..548e2bdd94eb8620e847f950c250492906560925 100644 (file)
--- a/qcsrc/client/prandom.qc
+++ b/qcsrc/client/prandom.qc
@@ -1,6 +1,5 @@
 #include "prandom.qh"
-
-#include "../dpdefs/csprogsdefs.qh"
+#include "_.qh"
 
 #include "../warpzonelib/mathlib.qh"
 

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index da947cc1348bbc4fa751d7cac3f1ea7ef9217f13..40db117cf95d49d88fc3d5862bb2517ff047d045 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1,10 +1,7 @@
 #include "scoreboard.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hud.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
 #include "sortlist.qh"
 
 #include "../common/constants.qh"

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 0ee3e512a3cc62635fe9c39858977dbfac43149d..f3fcdb22184a4ca8de23531dbdbb7314e6b54f01 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -1,10 +1,7 @@
 #include "shownames.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hud.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
 
 #include "../common/constants.qh"
 #include "../common/mapinfo.qh"
@@ -13,9 +10,6 @@
 
 #include "../csqcmodellib/cl_model.qh"
 
-#include "../dpdefs/csprogsdefs.qh"
-
-
 // self.isactive = player is in range and coordinates/status (health and armor) are up to date
 // self.origin = player origin TODO: should maybe move this so it's the origin of the shownames tag already in SSQC for culling?
 // self.healthvalue

diff --git a/qcsrc/client/t_items.qc b/qcsrc/client/t_items.qc
index c319467db90bf858ae675214e11d1c7630c7cbef..525c88e5a16c5da8b3c34e5bdf060f1d42654725 100644 (file)
--- a/qcsrc/client/t_items.qc
+++ b/qcsrc/client/t_items.qc
@@ -1,11 +1,10 @@
-#include "autocvars.qh"
-#include "main.qh"
+#include "_.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/target_music.qc b/qcsrc/client/target_music.qc
index d72567cab88da008b1b6069b6264feb23d93de19..90faf1cfe27cdee376ef27dbbdb098629fdfc527 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -1,8 +1,5 @@
 #include "target_music.qh"
-
-#include "autocvars.qh"
-#include "defs.qh"
-#include "main.qh"
+#include "_.qh"
 
 #include "../common/constants.qh"
 #include "../common/util.qh"

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 2d7c327023142ca6ea68e7f9c02bee64c721cc01..19c8599d1ef0c97af4fad0c983598aab80261657 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -1,10 +1,7 @@
 #include "teamradar.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hud.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
 
 #include "../common/util.qh"
 

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index bcff5ede1565903ea8344ad61430e545d9750a50..b4e3ad58af302eada42df4a6b1620abac1044676 100644 (file)
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -1,10 +1,7 @@
 #include "tturrets.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hud.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
 #include "movelib.qh"
 #include "movetypes.qh"
 #include "prandom.qh"

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index aa20b3508a1a58602f9a7187908feb026dbe876f..b134fba43c20596903525c6eec6967b308199dd5 100644 (file)
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,7 +1,5 @@
 #include "tuba.qh"
-
-#include "autocvars.qh"
-#include "main.qh"
+#include "_.qh"
 
 #include "../common/constants.qh"
 #include "../common/util.qh"

diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc
index db1df041deb72508d134d4f9570745aac5b860a0..9d0845dd25eba824812f92ff7e3f62f9f90d0658 100644 (file)
--- a/qcsrc/client/vehicles/vehicles.qc
+++ b/qcsrc/client/vehicles/vehicles.qc
@@ -1,9 +1,6 @@
 #include "vehicles.qh"
+#include "../_.qh"
 
-#include "../autocvars.qh"
-#include "../defs.qh"
-#include "../main.qh"
-#include "../miscfunctions.qh"
 #include "../movetypes.qh"
 #include "../movetypes.qh"
 #include "../prandom.qh"
@@ -17,8 +14,6 @@
 
 #include "../../csqcmodellib/cl_model.qh"
 
-#include "../../dpdefs/csprogsdefs.qh"
-
 .float cnt;
 
 const string hud_bg = "gfx/vehicles/frame.tga";

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 1a75fa0ef1015638d2be3f9845d674b87d71b8e4..cbb662900214abe33a09ce04351f854dbc0be3b4 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1,12 +1,10 @@
+#include "_.qh"
+
 #include "announcer.qh"
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hook.qh"
 #include "hud.qh"
 #include "hud_config.qh"
-#include "main.qh"
 #include "mapvoting.qh"
-#include "miscfunctions.qh"
 #include "noise.qh"
 #include "scoreboard.qh"
 #include "shownames.qh"
@@ -25,8 +23,6 @@
 
 #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 98a2318d7b74de9d4a3dc9f31e3907ec18dc8c89..090dda58ee8962836bfe174eda81537d05c76fb0 100644 (file)
--- a/qcsrc/client/wall.qc
+++ b/qcsrc/client/wall.qc
@@ -1,8 +1,7 @@
 #include "wall.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
 #include "bgmscript.qh"
-#include "main.qh"
 
 #include "../common/util.qh"
 

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index 34c1d08985dd93233ad95801eab5d0e3a04dbaf8..188db095351b8039d052b4b0ded54b6adad2d7e3 100644 (file)
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -1,10 +1,7 @@
 #include "waypointsprites.qh"
+#include "_.qh"
 
-#include "autocvars.qh"
-#include "defs.qh"
 #include "hud.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
 #include "teamradar.qh"
 
 #include "../common/buffs.qh"