From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 2 May 2015 05:15:44 +0000 (+1000)
Subject: Create common client header
X-Git-Tag: xonotic-v0.8.1~61^2~19
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c24c0ac5d2fb38c25ab33c552bf8959d0976058f

Create common client header
---

diff --git a/qcsrc/client/_.qh b/qcsrc/client/_.qh
new file mode 100644
index 0000000000..8b811bceba
--- /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 30231d1495..ad61ea1586 100644
--- 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 d88622070b..eeba139c55 100644
--- 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 7dd79754ca..28a8390b0d 100644
--- 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 5bef3cc9c9..44a4fa5328 100644
--- 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 6826b03ce3..e523f4f425 100644
--- 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 077c36a2ac..de51aa3e16 100644
--- 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 efdcd2e56e..e0fec0e60b 100644
--- 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 5d8394cd0b..27351d455c 100644
--- 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 0053541b1f..b76fbc375e 100644
--- 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 f6c3f53a7c..5c2779e1dc 100644
--- 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 f0a9a45946..1d5362903a 100644
--- 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 5eafa68faf..a74a4bf1b4 100644
--- 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 e0f8b0d234..588ed534e3 100644
--- 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 ae88b424b7..be7ea0e3f9 100644
--- 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 1eea25d8fc..692e684d20 100644
--- 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 88b5494149..c26eac663f 100644
--- 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 1896801fb5..450d88b363 100644
--- 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 24c01ce303..aad855091d 100644
--- 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 3262488617..548e2bdd94 100644
--- 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 da947cc134..40db117cf9 100644
--- 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 0ee3e512a3..f3fcdb2218 100644
--- 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 c319467db9..525c88e5a1 100644
--- 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 d72567cab8..90faf1cfe2 100644
--- 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 2d7c327023..19c8599d1e 100644
--- 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 bcff5ede15..b4e3ad58af 100644
--- 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 aa20b3508a..b134fba43c 100644
--- 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 db1df041de..9d0845dd25 100644
--- 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 1a75fa0ef1..cbb6629002 100644
--- 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 98a2318d7b..090dda58ee 100644
--- 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 34c1d08985..188db09535 100644
--- 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"