Remove includes from most headers

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index c526c0b4cbfb426fa3c138cd68bf5a62af2dcf89..4ce4efe4e677a26f86a00748603bc621e4373b9c 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -1,40 +1,6 @@
 #ifndef CLIENT_AUTOCVARS_H
 #define CLIENT_AUTOCVARS_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 bool autocvar__con_chat_maximized;
 bool autocvar__hud_configure;
 string autocvar__hud_panelorder;

diff --git a/qcsrc/client/bgmscript.qh b/qcsrc/client/bgmscript.qh
index 8e2c76d22e7c4216b0597c2577e4bea5d1b0bedb..1590e594d6728d31ebc716edd6447a55bcf8f2d5 100644 (file)
--- a/qcsrc/client/bgmscript.qh
+++ b/qcsrc/client/bgmscript.qh
@@ -1,51 +1,6 @@
 #ifndef BGMSCRIPT_H
 #define BGMSCRIPT_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-    #include "waypointsprites.qh"
-    #include "movetypes.qh"
-    #include "prandom.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 .string bgmscript;
 .float bgmscriptattack;
 .float bgmscriptdecay;

diff --git a/qcsrc/client/command/cl_cmd.qh b/qcsrc/client/command/cl_cmd.qh
index 3a3abe72a15ef987477c59014a4c0fc8a8c33cfb..31da5a299b7de7776c42ec497ed06decfe58f6f1 100644 (file)
--- a/qcsrc/client/command/cl_cmd.qh
+++ b/qcsrc/client/command/cl_cmd.qh
@@ -5,38 +5,6 @@
 //  Last updated: December 17th, 2011
 // ==============================================
 
-#if defined(CSQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/csprogsdefs.qh"
-    #include "../sys-post.qh"
-    #include "../defs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/client.qh"
-    #include "../../common/playerstats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../../common/mapinfo.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/animdecide.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 void Cmd_HUD_SetFields(int);
 void Cmd_HUD_Help();
 

diff --git a/qcsrc/client/damage.qh b/qcsrc/client/damage.qh
index a18a2d06776fb5c245b2507f2770221c343e192f..2498e23eef4a0fd8b73b6c66cddff31e0945cb45 100644 (file)
--- a/qcsrc/client/damage.qh
+++ b/qcsrc/client/damage.qh
@@ -1,42 +1,5 @@
 #ifndef DAMAGE_H
 #define DAMAGE_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 .float total_damages; // number of effects which currently are attached to a player
 #endif
\ No newline at end of file

diff --git a/qcsrc/client/defs.qh b/qcsrc/client/defs.qh
index 2a6602405431487e211db7f77af93d48fb32353e..b13583f6f514785ce4a3f2e28076ad07e00ca50b 100644 (file)
--- a/qcsrc/client/defs.qh
+++ b/qcsrc/client/defs.qh
@@ -1,11 +1,6 @@
 #ifndef DEFS_H
 #define DEFS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 //NOTE: THIS IS AN INTERFACE FILE. DO NOT EDIT.
 //MODIFYING THIS FILE CAN RESULT IN CRC ERRORS.
 //YOU HAVE BEEN WARNED.

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index ec9ccc1fb61b8ff3d3c739f3ef097c078f7218eb..5c21886c53b93bfc1f77d5439ac9e2f464132b51 100644 (file)
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -1,46 +1,6 @@
 #ifndef HUD_H
 #define HUD_H
 
-#if defined(CSQC)
-       #include "../common/util-pre.qh"
-       #include "sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "sys-post.qh"
-       #include "defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "../common/constants.qh"
-       #include "../common/stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "../common/playerstats.qh"
-       #include "../common/teams.qh"
-       #include "../common/util.qh"
-       #include "../common/nades.qh"
-       #include "../common/buffs.qh"
-       #include "../common/test.qh"
-       #include "../common/counting.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "../common/mapinfo.qh"
-       #include "../common/command/markup.qh"
-       #include "../common/command/rpn.qh"
-       #include "../common/command/generic.qh"
-       #include "../common/command/shared_defs.qh"
-       #include "../common/urllib.qh"
-       #include "../common/animdecide.qh"
-       #include "command/cl_cmd.qh"
-       #include "../common/monsters/monsters.qh"
-       #include "autocvars.qh"
-       #include "../common/notifications.qh"
-       #include "../common/deathtypes.qh"
-       #include "damage.qh"
-       #include "../csqcmodellib/interpolate.qh"
-       #include "teamradar.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 const int HUD_PANEL_MAX = 24;
 entity hud_panel[HUD_PANEL_MAX];
 const int HUD_PANEL_FIRST = 0;

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index f407875e1de6c1eeb12ef9ce4e46ceeabd3caffe..3b36a12c0ea3bd31701fa330d13ec669e62beed7 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -1,55 +1,6 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-    #include "waypointsprites.qh"
-    #include "movetypes.qh"
-    #include "prandom.qh"
-    #include "bgmscript.qh"
-    #include "noise.qh"
-    #include "tturrets.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 // --------------------------------------------------------------------------
 // MENU Functionality
 

diff --git a/qcsrc/client/movetypes.qh b/qcsrc/client/movetypes.qh
index 3c1f521ebc4a3aa91dd78c55b796882b2a26151d..5625c23badd45c161b51e30e86f32a88ee9541cf 100644 (file)
--- a/qcsrc/client/movetypes.qh
+++ b/qcsrc/client/movetypes.qh
@@ -1,49 +1,6 @@
 #ifndef MOVETYPES_H
 #define MOVETYPES_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-    #include "waypointsprites.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 .float move_movetype;
 .float move_time;
 .vector move_origin;

diff --git a/qcsrc/client/noise.qh b/qcsrc/client/noise.qh
index 7761c4c7fc847998aaba2b44625f604733282d2a..d0196be089c1e3966771283be31994b0239800e5 100644 (file)
--- a/qcsrc/client/noise.qh
+++ b/qcsrc/client/noise.qh
@@ -1,52 +1,6 @@
 #ifndef NOISE_H
 #define NOISE_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-    #include "waypointsprites.qh"
-    #include "movetypes.qh"
-    #include "prandom.qh"
-    #include "bgmscript.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 // noises "usually" start in the range -1..1
 float Noise_Brown(entity e, float dt);
 float Noise_Pink(entity e, float dt);

diff --git a/qcsrc/client/player_skeleton.qh b/qcsrc/client/player_skeleton.qh
index 508041debf25b27d72c848ec837f4fe18ecea411..65dec0a36b1208760b2f0423695f32f28e825e5f 100644 (file)
--- a/qcsrc/client/player_skeleton.qh
+++ b/qcsrc/client/player_skeleton.qh
@@ -1,62 +1,6 @@
 #ifndef PLAYER_SKELETON
 #define PLAYER_SKELETON
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-    #include "waypointsprites.qh"
-    #include "movetypes.qh"
-    #include "prandom.qh"
-    #include "bgmscript.qh"
-    #include "noise.qh"
-    #include "tturrets.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-    #include "main.qh"
-    #include "vehicles/vehicles.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/cl_model.qh"
-    #include "../csqcmodellib/cl_player.qh"
-    #include "weapons/projectile.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 void free_skeleton_from_frames(entity e);
 void skeleton_from_frames(entity e, float is_dead);
 void skeleton_loadinfo(entity e);

diff --git a/qcsrc/client/prandom.qh b/qcsrc/client/prandom.qh
index 5af1ef6704561f22a0eb064be485051d4373346f..3ba1c475b6366dec8809405b559d0b269065ff74 100644 (file)
--- a/qcsrc/client/prandom.qh
+++ b/qcsrc/client/prandom.qh
@@ -1,50 +1,6 @@
 #ifndef PRANDOM_H
 #define PRANDOM_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-    #include "waypointsprites.qh"
-    #include "movetypes.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 // prandom - PREDICTABLE random number generator
 
 #define USE_PRANDOM

diff --git a/qcsrc/client/scoreboard.qh b/qcsrc/client/scoreboard.qh
index 7754ca5b719979e89f09bdad018e35661a76b26b..388e254c2740f9af608629828edc7445bf7da84c 100644 (file)
--- a/qcsrc/client/scoreboard.qh
+++ b/qcsrc/client/scoreboard.qh
@@ -1,47 +1,6 @@
 #ifndef SCOREBOARD_H
 #define SCOREBOARD_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 float HUD_WouldDrawScoreboard(void);
 float scoreboard_active;
 float scoreboard_fade_alpha;

diff --git a/qcsrc/client/shownames.qh b/qcsrc/client/shownames.qh
index 0f6a674a74601a6f494106221c81f5db1743057b..4074f7a7006cd941abf144f98de5e2c3a0fd9046 100644 (file)
--- a/qcsrc/client/shownames.qh
+++ b/qcsrc/client/shownames.qh
@@ -1,64 +1,6 @@
 #ifndef SHOWNAMES_H
 #define SHOWNAMES_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-    #include "waypointsprites.qh"
-    #include "movetypes.qh"
-    #include "prandom.qh"
-    #include "bgmscript.qh"
-    #include "noise.qh"
-    #include "tturrets.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-    #include "main.qh"
-    #include "vehicles/vehicles.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/cl_model.qh"
-    #include "../csqcmodellib/cl_player.qh"
-    #include "weapons/projectile.qh"
-    #include "player_skeleton.qh"
-    #include "../server/t_items.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 .float healthvalue;
 .float armorvalue;
 .float sameteam;

diff --git a/qcsrc/client/sys-post.qh b/qcsrc/client/sys-post.qh
index 611ea72e64e625540d94f60e1ee341c32d21b4a7..c2b43cdf028ab5a57de59ca7a9d991336caeeb63 100644 (file)
--- a/qcsrc/client/sys-post.qh
+++ b/qcsrc/client/sys-post.qh
@@ -1,14 +1,6 @@
 #ifndef SYS_POST_H
 #define SYS_POST_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 #pragma noref 0
 
 #undef ATTEN_NORM

diff --git a/qcsrc/client/sys-pre.qh b/qcsrc/client/sys-pre.qh
index f6202b51c2c7613b94c74ba9dbab4d34ab36a53e..c8e8c9d0767a9991e28be440708359d06d0d3176 100644 (file)
--- a/qcsrc/client/sys-pre.qh
+++ b/qcsrc/client/sys-pre.qh
@@ -1,12 +1,6 @@
 #ifndef SYS_PRE_H
 #define SYS_PRE_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 #define ATTEN_NORM builtin_ATTEN_NORM
 
 #pragma noref 1

diff --git a/qcsrc/client/teamradar.qh b/qcsrc/client/teamradar.qh
index b03d5ccac700c4c9ab358aac7889cc349697762e..3585b732990bcac65955360125d8461d39783143 100644 (file)
--- a/qcsrc/client/teamradar.qh
+++ b/qcsrc/client/teamradar.qh
@@ -1,45 +1,6 @@
 #ifndef TEAMRADAR_H
 #define TEAMRADAR_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 const int MAX_TEAMRADAR_TIMES = 32;
 
 // to make entities have dots on the team radar

diff --git a/qcsrc/client/tturrets.qh b/qcsrc/client/tturrets.qh
index cf3a3f565b4aeb024e1803838bc7069950746038..b6184dc4def131b10d58c0df1546d04da4fe86d0 100644 (file)
--- a/qcsrc/client/tturrets.qh
+++ b/qcsrc/client/tturrets.qh
@@ -1,53 +1,6 @@
 #ifndef TTURRETS_H
 #define TTURRETS_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-    #include "waypointsprites.qh"
-    #include "movetypes.qh"
-    #include "prandom.qh"
-    #include "bgmscript.qh"
-    #include "noise.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 void ent_turret();
 void turrets_precache();
 .entity tur_head;

diff --git a/qcsrc/client/vehicles/vehicles.qh b/qcsrc/client/vehicles/vehicles.qh
index 1cd91006bd8688a0338b920eeeeb98d4ecb3d554..fa4875b60eb9d7cc9f7a8efdb56e02d50f2d9482 100644 (file)
--- a/qcsrc/client/vehicles/vehicles.qh
+++ b/qcsrc/client/vehicles/vehicles.qh
@@ -1,56 +1,6 @@
 #ifndef VEHICLES_H
 #define VEHICLES_H
 
-#if defined(CSQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/csprogsdefs.qh"
-    #include "../sys-post.qh"
-    #include "../defs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/client.qh"
-    #include "../../common/playerstats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../../common/mapinfo.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/animdecide.qh"
-    #include "../command/cl_cmd.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../autocvars.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../damage.qh"
-    #include "../../csqcmodellib/interpolate.qh"
-    #include "../teamradar.qh"
-    #include "../hud.qh"
-    #include "../scoreboard.qh"
-    #include "../waypointsprites.qh"
-    #include "../movetypes.qh"
-    #include "../prandom.qh"
-    #include "../bgmscript.qh"
-    #include "../noise.qh"
-    #include "../tturrets.qh"
-    #include "../../server/tturrets/include/turrets_early.qh"
-    #include "../main.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 void RaptorCBShellfragDraw();
 void RaptorCBShellfragToss(vector _org, vector _vel, vector _ang);
 void Vehicles_Precache();

diff --git a/qcsrc/client/waypointsprites.qh b/qcsrc/client/waypointsprites.qh
index ff8d61dfe7f665fab276261b3ed22c72a2e11293..9a066a4eeab91d096d755f4a2362c817ed2dd018 100644 (file)
--- a/qcsrc/client/waypointsprites.qh
+++ b/qcsrc/client/waypointsprites.qh
@@ -1,48 +1,6 @@
 #ifndef WAYPOINTSPRITES_H
 #define WAYPOINTSPRITES_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 // they are drawn using a .draw function
 void Ent_WaypointSprite();
 void Ent_RemoveWaypointSprite();

diff --git a/qcsrc/client/weapons/projectile.qh b/qcsrc/client/weapons/projectile.qh
index 2f9d03571c5feb023e90df083ae32844f290d2e0..a48ff1ad5077aff4433f8b64d8c088ed5280def2 100644 (file)
--- a/qcsrc/client/weapons/projectile.qh
+++ b/qcsrc/client/weapons/projectile.qh
@@ -1,61 +1,6 @@
 #ifndef PROJECTILE_H
 #define PROJECTILE_H
 
-#if defined(CSQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/csprogsdefs.qh"
-    #include "../sys-post.qh"
-    #include "../defs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/client.qh"
-    #include "../../common/playerstats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../../common/mapinfo.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/animdecide.qh"
-    #include "../command/cl_cmd.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../autocvars.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../damage.qh"
-    #include "../../csqcmodellib/interpolate.qh"
-    #include "../teamradar.qh"
-    #include "../hud.qh"
-    #include "../scoreboard.qh"
-    #include "../waypointsprites.qh"
-    #include "../movetypes.qh"
-    #include "../prandom.qh"
-    #include "../bgmscript.qh"
-    #include "../noise.qh"
-    #include "../tturrets.qh"
-    #include "../../server/tturrets/include/turrets_early.qh"
-    #include "../main.qh"
-    #include "../vehicles/vehicles.qh"
-    #include "../../common/csqcmodel_settings.qh"
-    #include "../../csqcmodellib/common.qh"
-    #include "../../csqcmodellib/cl_model.qh"
-    #include "../../csqcmodellib/cl_player.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 .int traileffect;
 void Projectile_ResetTrail(vector to);
 void Projectile_DrawTrail(vector to);

diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh
index 06ad9c761be4ede33a3f719288fac77c67766e04..c4834793aba4a11ada58621ddb3b4a1ce4130242 100644 (file)
--- a/qcsrc/common/animdecide.qh
+++ b/qcsrc/common/animdecide.qh
@@ -1,61 +1,6 @@
 #ifndef ANIMDECIDE_H
 #define ANIMDECIDE_H
 
-#if defined(CSQC)
-    #include "util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "weapons/weapons.qh"
-    #include "mapinfo.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "urllib.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "net_notice.qh"
-#endif
-
 // must be called at least once to initialize, or when modelindex is changed
 void animdecide_load_if_needed(entity e);
 

diff --git a/qcsrc/common/buffs.qh b/qcsrc/common/buffs.qh
index c789981b295a80d86a06780d3ce3102d97fdbd08..e2dcbae2cff3e78a01134c4f697e0402a1fdbac4 100644 (file)
--- a/qcsrc/common/buffs.qh
+++ b/qcsrc/common/buffs.qh
@@ -1,42 +1,6 @@
 #ifndef BUFFS_H
 #define BUFFS_H
 
-#if defined(CSQC)
-       #include "util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "constants.qh"
-       #include "stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "playerstats.qh"
-       #include "teams.qh"
-       #include "util.qh"
-       #include "nades.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-#endif
-
 entity Buff_Type_first;
 entity Buff_Type_last;
 .entity enemy; // internal next pointer

diff --git a/qcsrc/common/campaign_common.qh b/qcsrc/common/campaign_common.qh
index d105fd5953cb6782c4252976319f070f167bd2a5..01dbeb91911e2f397e72c1e07c77ef259923e39c 100644 (file)
--- a/qcsrc/common/campaign_common.qh
+++ b/qcsrc/common/campaign_common.qh
@@ -1,75 +1,6 @@
 #ifndef CAMPAIGN_COMMON_H
 #define CAMPAIGN_COMMON_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
-    #include "test.qh"
-    #include "../menu/oo/base.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-    #include "constants.qh"
-    #include "mapinfo.qh"
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "net_notice.qh"
-    #include "animdecide.qh"
-    #include "monsters/monsters.qh"
-    #include "monsters/sv_monsters.qh"
-    #include "monsters/spawn.qh"
-    #include "weapons/config.qh"
-    #include "weapons/weapons.qh"
-    #include "../server/weapons/accuracy.qh"
-    #include "../server/weapons/common.qh"
-    #include "../server/weapons/csqcprojectile.qh"
-    #include "../server/weapons/hitplot.qh"
-    #include "../server/weapons/selection.qh"
-    #include "../server/weapons/spawning.qh"
-    #include "../server/weapons/throwing.qh"
-    #include "../server/weapons/tracing.qh"
-    #include "../server/weapons/weaponstats.qh"
-    #include "../server/weapons/weaponsystem.qh"
-    #include "../server/t_items.qh"
-    #include "../server/autocvars.qh"
-    #include "../server/constants.qh"
-    #include "../server/defs.qh"
-    #include "notifications.qh"
-    #include "deathtypes.qh"
-    #include "../server/mutators/mutators_include.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-    #include "../server/vehicles/vehicles_def.qh"
-    #include "../server/campaign.qh"
-#endif
-
 #ifndef CAMPAIGN_MAX_ENTRIES
 #define CAMPAIGN_MAX_ENTRIES 64
 #endif

diff --git a/qcsrc/common/command/generic.qh b/qcsrc/common/command/generic.qh
index 7b4b82fe7f65b8c115014524c84621f02ac98e57..d1faa250ea409dfbcb4b90b128773e384db6284b 100644 (file)
--- a/qcsrc/common/command/generic.qh
+++ b/qcsrc/common/command/generic.qh
@@ -1,73 +1,6 @@
 #ifndef GENERIC_H
 #define GENERIC_H
 
-#if defined(CSQC)
-    #include "../util-pre.qh"
-    #include "../../client/sys-pre.qh"
-    #include "../../dpdefs/csprogsdefs.qh"
-    #include "../../client/sys-post.qh"
-    #include "../../client/defs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/client.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../weapons/weapons.qh"
-    #include "../mapinfo.qh"
-    #include "markup.qh"
-    #include "rpn.qh"
-#elif defined(MENUQC)
-    #include "../util-pre.qh"
-    #include "../../menu/sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../menu/sys-post.qh"
-    #include "../../menu/config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../util.qh"
-    #include "../test.qh"
-    #include "../../menu/oo/base.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../constants.qh"
-    #include "../mapinfo.qh"
-    #include "../campaign_common.qh"
-    #include "../weapons/weapons.qh"
-    #include "../counting.qh"
-    #include "markup.qh"
-    #include "rpn.qh"
-#elif defined(SVQC)
-    #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "markup.qh"
-    #include "rpn.qh"
-#endif
 // =========================================================
 //  Declarations for common command code, written by Samual
 //  Last updated: December 28th, 2011

diff --git a/qcsrc/common/command/markup.qh b/qcsrc/common/command/markup.qh
index 270293601964530a6eec140944e274d33ef1ba9a..918d3d3cc967ebba6b1c0a14877dcf30cf0133a0 100644 (file)
--- a/qcsrc/common/command/markup.qh
+++ b/qcsrc/common/command/markup.qh
@@ -1,67 +1,6 @@
 #ifndef MARKUP_H
 #define MARKUP_H
 
-#if defined(CSQC)
-    #include "../util-pre.qh"
-    #include "../../client/sys-pre.qh"
-    #include "../../dpdefs/csprogsdefs.qh"
-    #include "../../client/sys-post.qh"
-    #include "../../client/defs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/client.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../weapons/weapons.qh"
-    #include "../mapinfo.qh"
-#elif defined(MENUQC)
-    #include "../util-pre.qh"
-    #include "../../menu/sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../menu/sys-post.qh"
-    #include "../../menu/config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../util.qh"
-    #include "../test.qh"
-    #include "../../menu/oo/base.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../constants.qh"
-    #include "../mapinfo.qh"
-    #include "../campaign_common.qh"
-    #include "../weapons/weapons.qh"
-    #include "../counting.qh"
-#elif defined(SVQC)
-    #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-#endif
 // ==========================================================
 //  Declarations for markup command code, reworked by Samual
 //  Last updated: December 28th, 2011

diff --git a/qcsrc/common/command/rpn.qh b/qcsrc/common/command/rpn.qh
index 6d9bf9f85eb34fa881c73ae4fa0b5e997b26ce96..e811a78bb3c78fe3f4dc3426e793e6ef5623555b 100644 (file)
--- a/qcsrc/common/command/rpn.qh
+++ b/qcsrc/common/command/rpn.qh
@@ -1,70 +1,6 @@
 #ifndef RPN_H
 #define RPN_H
 
-#if defined(CSQC)
-    #include "../util-pre.qh"
-    #include "../../client/sys-pre.qh"
-    #include "../../dpdefs/csprogsdefs.qh"
-    #include "../../client/sys-post.qh"
-    #include "../../client/defs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/client.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../weapons/weapons.qh"
-    #include "../mapinfo.qh"
-    #include "markup.qh"
-#elif defined(MENUQC)
-    #include "../util-pre.qh"
-    #include "../../menu/sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../menu/sys-post.qh"
-    #include "../../menu/config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../util.qh"
-    #include "../test.qh"
-    #include "../../menu/oo/base.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../constants.qh"
-    #include "../mapinfo.qh"
-    #include "../campaign_common.qh"
-    #include "../weapons/weapons.qh"
-    #include "../counting.qh"
-    #include "markup.qh"
-#elif defined(SVQC)
-    #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "markup.qh"
-#endif
 // =========================================================
 //  Declarations for RPN command code, written by divVerent
 //  Last updated: December 28th, 2011

diff --git a/qcsrc/common/command/shared_defs.qh b/qcsrc/common/command/shared_defs.qh
index a3cbaca32a63013fd9d52401650ad416dc634ff5..e7edd3543663d24a17174183d711c4bf1093c61f 100644 (file)
--- a/qcsrc/common/command/shared_defs.qh
+++ b/qcsrc/common/command/shared_defs.qh
@@ -1,77 +1,6 @@
 #ifndef SHARED_DEFS_H
 #define SHARED_DEFS_H
 
-#if defined(CSQC)
-    #include "../util-pre.qh"
-    #include "../../client/sys-pre.qh"
-    #include "../../dpdefs/csprogsdefs.qh"
-    #include "../../client/sys-post.qh"
-    #include "../../client/defs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/client.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../weapons/weapons.qh"
-    #include "../mapinfo.qh"
-    #include "markup.qh"
-    #include "rpn.qh"
-    #include "generic.qh"
-#elif defined(MENUQC)
-    #include "../util-pre.qh"
-    #include "../../menu/sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../menu/sys-post.qh"
-    #include "../../menu/config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../util.qh"
-    #include "../test.qh"
-    #include "../../menu/oo/base.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../constants.qh"
-    #include "../mapinfo.qh"
-    #include "../campaign_common.qh"
-    #include "../weapons/weapons.qh"
-    #include "../counting.qh"
-    #include "markup.qh"
-    #include "rpn.qh"
-    #include "generic.qh"
-#elif defined(SVQC)
-    #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "markup.qh"
-    #include "rpn.qh"
-    #include "generic.qh"
-#endif
-
 // =========================================================
 //  Shared declarations for all commands, written by Samual
 //  Last updated: December 13th, 2011

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 886b720eb797fd7d926c6c7b272b8ba6135357d1..9e33205af228591a9e64f07cbb1ef6af7e6ecef5 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -1,39 +1,6 @@
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
 
-#if defined(CSQC)
-    #include "util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-#elif defined(MENUQC)
-    #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
-    #include "test.qh"
-    #include "../menu/oo/base.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-#endif
-
 const int AS_STRING = 1;
 const int AS_INT = 2;
 const int AS_FLOAT_TRUNCATED = 2;

diff --git a/qcsrc/common/counting.qh b/qcsrc/common/counting.qh
index c5c95671cf9ae2ec4600bf0fe304a496d46ff296..77149f26b670f3d975b77ee1ea415ec25bc88d60 100644 (file)
--- a/qcsrc/common/counting.qh
+++ b/qcsrc/common/counting.qh
@@ -1,62 +1,6 @@
 #ifndef COUNTING_H
 #define COUNTING_H
 
-#if defined(CSQC)
-       #include "util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "constants.qh"
-       #include "stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "playerstats.qh"
-       #include "teams.qh"
-       #include "util.qh"
-       #include "nades.qh"
-       #include "buffs.qh"
-       #include "test.qh"
-#elif defined(MENUQC)
-       #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
-    #include "test.qh"
-    #include "../menu/oo/base.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-    #include "constants.qh"
-    #include "mapinfo.qh"
-    #include "campaign_common.qh"
-    #include "weapons/weapons.qh"
-#elif defined(SVQC)
-       #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-#endif
-
 // ===============================================
 //  Time processing and counting functions/macros
 // ===============================================

diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh
index 04a7a7d3ef0745548a90aa04dbb2322679e94564..1ad245c867a368a65a758f288fe5419dcd923282 100644 (file)
--- a/qcsrc/common/csqcmodel_settings.qh
+++ b/qcsrc/common/csqcmodel_settings.qh
@@ -1,116 +1,6 @@
 #ifndef CSQCMODEL_SETTINGS_H
 #define CSQCMODEL_SETTINGS_H
 
-#if defined(CSQC)
-       #include "util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "constants.qh"
-       #include "stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "playerstats.qh"
-       #include "teams.qh"
-       #include "util.qh"
-       #include "nades.qh"
-       #include "buffs.qh"
-       #include "test.qh"
-       #include "counting.qh"
-       #include "weapons/weapons.qh"
-       #include "mapinfo.qh"
-       #include "command/markup.qh"
-       #include "command/rpn.qh"
-       #include "command/generic.qh"
-       #include "command/shared_defs.qh"
-       #include "urllib.qh"
-       #include "animdecide.qh"
-       #include "../client/command/cl_cmd.qh"
-       #include "monsters/monsters.qh"
-       #include "../client/autocvars.qh"
-       #include "notifications.qh"
-       #include "deathtypes.qh"
-       #include "../client/damage.qh"
-       #include "../csqcmodellib/interpolate.qh"
-       #include "../client/teamradar.qh"
-       #include "../client/hud.qh"
-       #include "../client/scoreboard.qh"
-       #include "../client/waypointsprites.qh"
-       #include "../client/movetypes.qh"
-       #include "../client/prandom.qh"
-       #include "../client/bgmscript.qh"
-       #include "../client/noise.qh"
-       #include "../client/tturrets.qh"
-       #include "../server/tturrets/include/turrets_early.qh"
-       #include "../client/main.qh"
-       #include "../client/vehicles/vehicles.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "net_notice.qh"
-    #include "animdecide.qh"
-    #include "monsters/monsters.qh"
-    #include "monsters/sv_monsters.qh"
-    #include "monsters/spawn.qh"
-    #include "weapons/config.qh"
-    #include "weapons/weapons.qh"
-    #include "../server/weapons/accuracy.qh"
-    #include "../server/weapons/common.qh"
-    #include "../server/weapons/csqcprojectile.qh"
-    #include "../server/weapons/hitplot.qh"
-    #include "../server/weapons/selection.qh"
-    #include "../server/weapons/spawning.qh"
-    #include "../server/weapons/throwing.qh"
-    #include "../server/weapons/tracing.qh"
-    #include "../server/weapons/weaponstats.qh"
-    #include "../server/weapons/weaponsystem.qh"
-    #include "../server/t_items.qh"
-    #include "../server/autocvars.qh"
-    #include "../server/constants.qh"
-    #include "../server/defs.qh"
-    #include "notifications.qh"
-    #include "deathtypes.qh"
-    #include "../server/mutators/mutators_include.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-    #include "../server/vehicles/vehicles_def.qh"
-    #include "../server/campaign.qh"
-    #include "campaign_common.qh"
-    #include "mapinfo.qh"
-    #include "../server/command/common.qh"
-    #include "../server/command/banning.qh"
-    #include "../server/command/radarmap.qh"
-    #include "../server/command/vote.qh"
-    #include "../server/command/getreplies.qh"
-    #include "../server/command/cmd.qh"
-    #include "../server/command/sv_cmd.qh"
-#endif
-
 // define this if svqc code wants to use .frame2 and .lerpfrac
 //#define CSQCMODEL_HAVE_TWO_FRAMES
 

diff --git a/qcsrc/common/deathtypes.qh b/qcsrc/common/deathtypes.qh
index 97d2b028571cc7101c024b1187038eaf26a67364..ddc7b1477e23eaeb11dd06f7bf354455708415e2 100644 (file)
--- a/qcsrc/common/deathtypes.qh
+++ b/qcsrc/common/deathtypes.qh
@@ -1,87 +1,6 @@
 #ifndef DEATHTYPES_H
 #define DEATHTYPES_H
 
-#if defined(CSQC)
-       #include "util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "constants.qh"
-       #include "stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "playerstats.qh"
-       #include "teams.qh"
-       #include "util.qh"
-       #include "nades.qh"
-       #include "buffs.qh"
-       #include "test.qh"
-       #include "counting.qh"
-       #include "weapons/weapons.qh"
-       #include "mapinfo.qh"
-       #include "command/markup.qh"
-       #include "command/rpn.qh"
-       #include "command/generic.qh"
-       #include "command/shared_defs.qh"
-       #include "urllib.qh"
-       #include "animdecide.qh"
-       #include "../client/command/cl_cmd.qh"
-       #include "monsters/monsters.qh"
-       #include "../client/autocvars.qh"
-       #include "notifications.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "net_notice.qh"
-    #include "animdecide.qh"
-    #include "monsters/monsters.qh"
-    #include "monsters/sv_monsters.qh"
-    #include "monsters/spawn.qh"
-    #include "weapons/config.qh"
-    #include "weapons/weapons.qh"
-    #include "../server/weapons/accuracy.qh"
-    #include "../server/weapons/common.qh"
-    #include "../server/weapons/csqcprojectile.qh"
-    #include "../server/weapons/hitplot.qh"
-    #include "../server/weapons/selection.qh"
-    #include "../server/weapons/spawning.qh"
-    #include "../server/weapons/throwing.qh"
-    #include "../server/weapons/tracing.qh"
-    #include "../server/weapons/weaponstats.qh"
-    #include "../server/weapons/weaponsystem.qh"
-    #include "../server/t_items.qh"
-    #include "../server/autocvars.qh"
-    #include "../server/constants.qh"
-    #include "../server/defs.qh"
-    #include "notifications.qh"
-#endif
-
 // ================================
 //  Deathtypes, reworked by Samual
 // ================================

diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index 960cdb3ff1c6fc08688cc8b9d74fb9cd3e1f1379..943e81fee573b81a9fd519e27aa995338e358761 100644 (file)
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@ -1,95 +1,6 @@
 #ifndef MAPINFO_H
 #define MAPINFO_H
 
-#if defined(CSQC)
-       #include "util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "constants.qh"
-       #include "stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "playerstats.qh"
-       #include "teams.qh"
-       #include "util.qh"
-       #include "nades.qh"
-       #include "buffs.qh"
-       #include "test.qh"
-       #include "counting.qh"
-       #include "weapons/weapons.qh"
-#elif defined(MENUQC)
-       #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
-    #include "test.qh"
-    #include "../menu/oo/base.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-    #include "constants.qh"
-#elif defined(SVQC)
-       #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "net_notice.qh"
-    #include "animdecide.qh"
-    #include "monsters/monsters.qh"
-    #include "monsters/sv_monsters.qh"
-    #include "monsters/spawn.qh"
-    #include "weapons/config.qh"
-    #include "weapons/weapons.qh"
-    #include "../server/weapons/accuracy.qh"
-    #include "../server/weapons/common.qh"
-    #include "../server/weapons/csqcprojectile.qh"
-    #include "../server/weapons/hitplot.qh"
-    #include "../server/weapons/selection.qh"
-    #include "../server/weapons/spawning.qh"
-    #include "../server/weapons/throwing.qh"
-    #include "../server/weapons/tracing.qh"
-    #include "../server/weapons/weaponstats.qh"
-    #include "../server/weapons/weaponsystem.qh"
-    #include "../server/t_items.qh"
-    #include "../server/autocvars.qh"
-    #include "../server/constants.qh"
-    #include "../server/defs.qh"
-    #include "notifications.qh"
-    #include "deathtypes.qh"
-    #include "../server/mutators/mutators_include.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-    #include "../server/vehicles/vehicles_def.qh"
-    #include "../server/campaign.qh"
-    #include "campaign_common.qh"
-#endif
-
 float MAPINFO_TYPE_ALL;
 entity MapInfo_Type_first;
 entity MapInfo_Type_last;

diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh
index d30f29894ec12ccf4a952a11b8bb2307a8593842..fec3f630dad395a4f522be1188709c1aba8daf9b 100644 (file)
--- a/qcsrc/common/monsters/all.qh
+++ b/qcsrc/common/monsters/all.qh
@@ -1,5 +1,11 @@
+// TODO: include once
+//#ifndef MONSTERS_ALL_H
+//#define MONSTERS_ALL_H
+
 #include "monster/zombie.qc"
 #include "monster/spider.qc"
 #include "monster/mage.qc"
 #include "monster/wyvern.qc"
 #include "monster/shambler.qc"
+
+//#endif
\ No newline at end of file

diff --git a/qcsrc/common/monsters/monsters.qh b/qcsrc/common/monsters/monsters.qh
index 1ef0e4a3e959429bb1cb4ad62573c0b18b733af5..c21b237bfd2b255a037c6a89fd392d4ad9e7bc93 100644 (file)
--- a/qcsrc/common/monsters/monsters.qh
+++ b/qcsrc/common/monsters/monsters.qh
@@ -1,86 +1,6 @@
 #ifndef MONSTERS_H
 #define MONSTERS_H
 
-#if defined(CSQC)
-       #include "../util-pre.qh"
-       #include "../../client/sys-pre.qh"
-       #include "../../dpdefs/csprogsdefs.qh"
-       #include "../../client/sys-post.qh"
-       #include "../../client/defs.qh"
-       #include "../../dpdefs/keycodes.qh"
-       #include "../constants.qh"
-       #include "../stats.qh"
-       #include "../../warpzonelib/anglestransform.qh"
-       #include "../../warpzonelib/mathlib.qh"
-       #include "../../warpzonelib/common.qh"
-       #include "../../warpzonelib/client.qh"
-       #include "../playerstats.qh"
-       #include "../teams.qh"
-       #include "../util.qh"
-       #include "../nades.qh"
-       #include "../buffs.qh"
-       #include "../test.qh"
-       #include "../counting.qh"
-       #include "../weapons/weapons.qh"
-       #include "../mapinfo.qh"
-       #include "../command/markup.qh"
-       #include "../command/rpn.qh"
-       #include "../command/generic.qh"
-       #include "../command/shared_defs.qh"
-       #include "../urllib.qh"
-       #include "../animdecide.qh"
-       #include "../../client/command/cl_cmd.qh"
-#elif defined(MENUQC)
-       #include "../util-pre.qh"
-    #include "../../menu/sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../menu/sys-post.qh"
-    #include "../../menu/config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../util.qh"
-    #include "../test.qh"
-    #include "../../menu/oo/base.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../constants.qh"
-    #include "../mapinfo.qh"
-    #include "../campaign_common.qh"
-    #include "../weapons/weapons.qh"
-    #include "../counting.qh"
-    #include "../command/markup.qh"
-    #include "../command/rpn.qh"
-    #include "../command/generic.qh"
-    #include "../command/shared_defs.qh"
-    #include "../urllib.qh"
-#elif defined(SVQC)
-       #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "../command/markup.qh"
-    #include "../command/rpn.qh"
-    #include "../command/generic.qh"
-    #include "../command/shared_defs.qh"
-    #include "../net_notice.qh"
-    #include "../animdecide.qh"
-#endif
-
 // monster requests
 const int MR_SETUP = 1; // (SERVER) setup monster data
 const int MR_THINK = 2; // (SERVER) logic to run every frame

diff --git a/qcsrc/common/monsters/spawn.qh b/qcsrc/common/monsters/spawn.qh
index 732d6349027417253b92f1b3bf7e6bf0ae9dfcc8..eff27541eea3fb70abf451baf5c0dc5a4c546752 100644 (file)
--- a/qcsrc/common/monsters/spawn.qh
+++ b/qcsrc/common/monsters/spawn.qh
@@ -1,36 +1,5 @@
 #ifndef SPAWN_H
 #define SPAWN_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "../command/markup.qh"
-    #include "../command/rpn.qh"
-    #include "../command/generic.qh"
-    #include "../command/shared_defs.qh"
-    #include "../net_notice.qh"
-    #include "../animdecide.qh"
-    #include "monsters.qh"
-    #include "sv_monsters.qh"
-#endif
 entity spawnmonster (string monster, float monster_id, entity spawnedby, entity own, vector orig, float respwn, float invincible, float moveflag);
 #endif
\ No newline at end of file

diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh
index 28dc8a80c460f12978f5b2c0556faff25d1c3d01..0ca54e54ba1d7482c5909f613cea91f47c74925a 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qh
+++ b/qcsrc/common/monsters/sv_monsters.qh
@@ -1,37 +1,6 @@
 #ifndef SV_MONSTERS_H
 #define SV_MONSTERS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "../command/markup.qh"
-    #include "../command/rpn.qh"
-    #include "../command/generic.qh"
-    #include "../command/shared_defs.qh"
-    #include "../net_notice.qh"
-    #include "../animdecide.qh"
-    #include "monsters.qh"
-#endif
-
 .string spawnmob;
 .float monster_attack;
 

diff --git a/qcsrc/common/nades.qh b/qcsrc/common/nades.qh
index 0f24ac63e3c75cfb367d177430209cb3ee84264f..60338c32dde924daf6e89d447bbbefb89dc9368c 100644 (file)
--- a/qcsrc/common/nades.qh
+++ b/qcsrc/common/nades.qh
@@ -1,40 +1,6 @@
 #ifndef NADES_H
 #define NADES_H
 
-#if defined(CSQC)
-       #include "util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "constants.qh"
-       #include "stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "playerstats.qh"
-       #include "teams.qh"
-       #include "util.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-#endif
-
 // use slots 70-100
 const int PROJECTILE_NADE = 71;
 const int PROJECTILE_NADE_BURN = 72;

diff --git a/qcsrc/common/net_notice.qh b/qcsrc/common/net_notice.qh
index ac6a5eae94e8f26917a09e62178ba1531b75c198..958b89adb98e446ccaa004d3c1226035665cbe29 100644 (file)
--- a/qcsrc/common/net_notice.qh
+++ b/qcsrc/common/net_notice.qh
@@ -1,34 +1,6 @@
 #ifndef NET_NOTICE_H
 #define NET_NOTICE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-#endif
-
 #ifdef CSQC
 void cl_notice_read();
 void sv_notice_to(entity _to, string _notice, float _howlong, float _modal);

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 578920115ef415fec08e0e8af0b417f93f5f926e..4bd519227278e28532617cdc7a804919647ede34 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -1,85 +1,6 @@
 #ifndef NOTIFICATIONS_H
 #define NOTIFICATIONS_H
 
-#if defined(CSQC)
-    #include "util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "weapons/weapons.qh"
-    #include "mapinfo.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "urllib.qh"
-    #include "animdecide.qh"
-    #include "../client/command/cl_cmd.qh"
-    #include "monsters/monsters.qh"
-    #include "../client/autocvars.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "net_notice.qh"
-    #include "animdecide.qh"
-    #include "monsters/monsters.qh"
-    #include "monsters/sv_monsters.qh"
-    #include "monsters/spawn.qh"
-    #include "weapons/config.qh"
-    #include "weapons/weapons.qh"
-    #include "../server/weapons/accuracy.qh"
-    #include "../server/weapons/common.qh"
-    #include "../server/weapons/csqcprojectile.qh"
-    #include "../server/weapons/hitplot.qh"
-    #include "../server/weapons/selection.qh"
-    #include "../server/weapons/spawning.qh"
-    #include "../server/weapons/throwing.qh"
-    #include "../server/weapons/tracing.qh"
-    #include "../server/weapons/weaponstats.qh"
-    #include "../server/weapons/weaponsystem.qh"
-    #include "../server/t_items.qh"
-    #include "../server/autocvars.qh"
-    #include "../server/constants.qh"
-    #include "../server/defs.qh"
-#endif
-
 // ================================================
 //  Unified notification system, written by Samual
 //  Last updated: March, 2013

diff --git a/qcsrc/common/playerstats.qh b/qcsrc/common/playerstats.qh
index b8b2385540652f9dff9a477f6f9daf626105ceec..50a1409c02ffd19a293dcdba654967ddc3f342b3 100644 (file)
--- a/qcsrc/common/playerstats.qh
+++ b/qcsrc/common/playerstats.qh
@@ -1,97 +1,6 @@
 #ifndef PLAYERSTATS_H
 #define PLAYERSTATS_H
 
-#if defined(CSQC)
-    #include "util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-#elif defined(MENUQC)
-    #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
-    #include "test.qh"
-    #include "../menu/oo/base.qh"
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "net_notice.qh"
-    #include "animdecide.qh"
-    #include "monsters/monsters.qh"
-    #include "monsters/sv_monsters.qh"
-    #include "monsters/spawn.qh"
-    #include "weapons/config.qh"
-    #include "weapons/weapons.qh"
-    #include "../server/weapons/accuracy.qh"
-    #include "../server/weapons/common.qh"
-    #include "../server/weapons/csqcprojectile.qh"
-    #include "../server/weapons/hitplot.qh"
-    #include "../server/weapons/selection.qh"
-    #include "../server/weapons/spawning.qh"
-    #include "../server/weapons/throwing.qh"
-    #include "../server/weapons/tracing.qh"
-    #include "../server/weapons/weaponstats.qh"
-    #include "../server/weapons/weaponsystem.qh"
-    #include "../server/t_items.qh"
-    #include "../server/autocvars.qh"
-    #include "../server/constants.qh"
-    #include "../server/defs.qh"
-    #include "notifications.qh"
-    #include "deathtypes.qh"
-    #include "../server/mutators/mutators_include.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-    #include "../server/vehicles/vehicles_def.qh"
-    #include "../server/campaign.qh"
-    #include "campaign_common.qh"
-    #include "mapinfo.qh"
-    #include "../server/command/common.qh"
-    #include "../server/command/banning.qh"
-    #include "../server/command/radarmap.qh"
-    #include "../server/command/vote.qh"
-    #include "../server/command/getreplies.qh"
-    #include "../server/command/cmd.qh"
-    #include "../server/command/sv_cmd.qh"
-    #include "csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "../server/anticheat.qh"
-    #include "../server/cheats.qh"
-#endif
-
 #ifdef SVQC
 //float PS_PM_IN_DB = -1;   // playerstats_prematch_in_db      // db for info COLLECTED at the beginning of a match
 float PS_GR_OUT_DB = -1;  // playerstats_gamereport_out_db   // db of info SENT at the end of a match

diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index e56331a45fbf375891767d134d9b8d713c69229b..a55b946f789674884491071658eed267ab3a1c5f 100644 (file)
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -1,29 +1,6 @@
 #ifndef STATS_H
 #define STATS_H
 
-#if defined(CSQC)
-    #include "util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "constants.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-#endif
-
 // Full list of all stat constants, included in a single location for easy reference
 // 255 is the current limit (MAX_CL_STATS - 1), engine will need to be modified if you wish to add more stats
 

diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh
index 5633ae5e799f46e61c143f312287444233e1714c..67fc37ad5e100b8842aa26924e26411b8f7608f1 100644 (file)
--- a/qcsrc/common/teams.qh
+++ b/qcsrc/common/teams.qh
@@ -1,47 +1,6 @@
 #ifndef TEAMS_H
 #define TEAMS_H
 
-#if defined(CSQC)
-       #include "util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "constants.qh"
-       #include "stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "playerstats.qh"
-#elif defined(MENUQC)
-       #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
-    #include "test.qh"
-    #include "../menu/oo/base.qh"
-    #include "playerstats.qh"
-#elif defined(SVQC)
-       #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-#endif
-
 #ifdef TEAMNUMBERS_THAT_ARENT_STUPID
 const int NUM_TEAM_1 = 1;  // red
 const int NUM_TEAM_2 = 2; // blue

diff --git a/qcsrc/common/test.qh b/qcsrc/common/test.qh
index fc26ccbc795fb1c701f4dba00353dad424c985fe..4ada66e6ba31e645a2cd3d128204cfd636b8a5cc 100644 (file)
--- a/qcsrc/common/test.qh
+++ b/qcsrc/common/test.qh
@@ -1,52 +1,6 @@
 #ifndef TEST_H
 #define TEST_H
 
-#if defined(CSQC)
-    #include "util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-#elif defined(MENUQC)
-    #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-#endif
-
 #define TEST_Check(cond) do { if(!(cond)) TEST_Fail(#cond); } while(0)
 
 void TEST_OK();

diff --git a/qcsrc/common/urllib.qh b/qcsrc/common/urllib.qh
index 1946e3b97c8d515636159e38a72fdb0f7cbf259a..8bc9e8333a62399d4c4fffb28b71be4015b497d1 100644 (file)
--- a/qcsrc/common/urllib.qh
+++ b/qcsrc/common/urllib.qh
@@ -1,75 +1,6 @@
 #ifndef URLLIB_H
 #define URLLIB_H
 
-#if defined(CSQC)
-    #include "util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "weapons/weapons.qh"
-    #include "mapinfo.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-#elif defined(MENUQC)
-    #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
-    #include "test.qh"
-    #include "../menu/oo/base.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-    #include "constants.qh"
-    #include "mapinfo.qh"
-    #include "campaign_common.qh"
-    #include "weapons/weapons.qh"
-    #include "counting.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-#endif
-
 const float URL_READY_ERROR    = -1;
 const float URL_READY_CLOSED   =  0;
 const float URL_READY_CANWRITE =  1;

diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index d8bd8636ab29e3fb39f02b96a147571fd642761e..b0327b4bda8fabcebccf26c1ad0bc2f4e97d83c6 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -1,11 +1,6 @@
 #ifndef UTIL_PRE_H
 #define UTIL_PRE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 #ifndef NOCOMPAT
     #define COMPAT_NO_MOD_IS_XONOTIC
 #endif

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 13c27c050209dc9105e6b89802da216a113332aa..5656c96530363d9cfdd4f7c8ff1bdd8a59a6fdf6 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -1,45 +1,6 @@
 #ifndef COMMON_UTIL_H
 #define COMMON_UTIL_H
 
-#if defined(CSQC)
-       #include "util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-#elif defined(MENUQC)
-       #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-#elif defined(SVQC)
-       #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-#endif
-
 #ifdef QCC_SUPPORT_ACCUMULATE
 # define ACCUMULATE_FUNCTION(func,otherfunc) \
        [[accumulate]] void func() { otherfunc(); }

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 4f4cd2b3d8f35a7bf82d3f2fdda523034f1f9475..834f9623e85425e483f6e7d14dea58824dc7e6cb 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -1,3 +1,6 @@
+// TODO: include once
+//#ifndef WEAPONS_ALL_H
+//#define WEAPONS_ALL_H
 // ONLY EVER ADD NEW WEAPONS AT THE END. IF YOU REMOVE ONE, PUT THE LAST ONE ON
 // ITS PLACE. THIS IS TO AVOID UNNECESSARY RENUMBERING OF WEAPON IMPULSES.
 // IF YOU DISREGARD THIS NOTICE, I'LL KILL YOU WITH THE @!#%'N TUBA
@@ -27,3 +30,5 @@
 #include "w_arc.qc"
 #include "w_hmg.qc"
 #include "w_rpc.qc"
+
+//#endif
\ No newline at end of file

diff --git a/qcsrc/common/weapons/calculations.qh b/qcsrc/common/weapons/calculations.qh
index 9a6dd1c547a78c2972d950d95fccf1c03c9aeeb4..71cdc21ac089305a3b0b63ed21f74568acd2103e 100644 (file)
--- a/qcsrc/common/weapons/calculations.qh
+++ b/qcsrc/common/weapons/calculations.qh
@@ -1,2 +1,5 @@
+#ifndef CALCULATIONS_H
+#define CALCULATIONS_H
 vector damage_explosion_calcpush(vector explosion_f, vector target_v, float speedfactor);
 vector W_CalculateSpread(vector forward, float spread, float spreadfactor, float spreadstyle);
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index 77edc196023bd724ba3fe1008020b25691dc889f..bf9f083687554987182258fece869bbfc08b2801 100644 (file)
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -1,39 +1,6 @@
 #ifndef WEAPONS_CONFIG_H
 #define WEAPONS_CONFIG_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "../command/markup.qh"
-    #include "../command/rpn.qh"
-    #include "../command/generic.qh"
-    #include "../command/shared_defs.qh"
-    #include "../net_notice.qh"
-    #include "../animdecide.qh"
-    #include "../monsters/monsters.qh"
-    #include "../monsters/sv_monsters.qh"
-    #include "../monsters/spawn.qh"
-#endif
-
 // ==========================
 //  Balance Config Generator
 // ==========================

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index 2fc4ef5570c1d6aff2dd7c47fbce40e0f7e16c3c..1b2b7f7eaec91f23b2e7c9ac9a70026ee089492c 100644 (file)
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -1,74 +1,6 @@
 #ifndef WEAPONS_H
 #define WEAPONS_H
 
-#if defined(CSQC)
-       #include "../util-pre.qh"
-       #include "../../client/sys-pre.qh"
-       #include "../../dpdefs/csprogsdefs.qh"
-       #include "../../client/sys-post.qh"
-       #include "../../client/defs.qh"
-       #include "../../dpdefs/keycodes.qh"
-       #include "../constants.qh"
-       #include "../stats.qh"
-       #include "../../warpzonelib/anglestransform.qh"
-       #include "../../warpzonelib/mathlib.qh"
-       #include "../../warpzonelib/common.qh"
-       #include "../../warpzonelib/client.qh"
-       #include "../playerstats.qh"
-       #include "../teams.qh"
-       #include "../util.qh"
-       #include "../nades.qh"
-       #include "../buffs.qh"
-       #include "../test.qh"
-       #include "../counting.qh"
-#elif defined(MENUQC)
-       #include "../util-pre.qh"
-    #include "../../menu/sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../../menu/sys-post.qh"
-    #include "../../menu/config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../util.qh"
-    #include "../test.qh"
-    #include "../../menu/oo/base.qh"
-    #include "../playerstats.qh"
-    #include "../teams.qh"
-    #include "../constants.qh"
-    #include "../mapinfo.qh"
-    #include "../campaign_common.qh"
-#elif defined(SVQC)
-       #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "../command/markup.qh"
-    #include "../command/rpn.qh"
-    #include "../command/generic.qh"
-    #include "../command/shared_defs.qh"
-    #include "../net_notice.qh"
-    #include "../animdecide.qh"
-    #include "../monsters/monsters.qh"
-    #include "../monsters/sv_monsters.qh"
-    #include "../monsters/spawn.qh"
-    #include "config.qh"
-#endif
-
 #ifndef MENUQC
 #include "calculations.qh"
 #endif

diff --git a/qcsrc/csqcmodellib/cl_model.qh b/qcsrc/csqcmodellib/cl_model.qh
index bd4c3891123a066d442af6706d60dc45f6ffd403..0204cd17e9c8dd9fd64d0735d6f9b070b2a70e1c 100644 (file)
--- a/qcsrc/csqcmodellib/cl_model.qh
+++ b/qcsrc/csqcmodellib/cl_model.qh
@@ -22,59 +22,6 @@
 #ifndef CL_MODEL_H
 #define CL_MODEL_H
 
-#if defined(CSQC)
-       #include "../common/util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "../common/constants.qh"
-       #include "../common/stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "../common/playerstats.qh"
-       #include "../common/teams.qh"
-       #include "../common/util.qh"
-       #include "../common/nades.qh"
-       #include "../common/buffs.qh"
-       #include "../common/test.qh"
-       #include "../common/counting.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "../common/mapinfo.qh"
-       #include "../common/command/markup.qh"
-       #include "../common/command/rpn.qh"
-       #include "../common/command/generic.qh"
-       #include "../common/command/shared_defs.qh"
-       #include "../common/urllib.qh"
-       #include "../common/animdecide.qh"
-       #include "../client/command/cl_cmd.qh"
-       #include "../common/monsters/monsters.qh"
-       #include "../client/autocvars.qh"
-       #include "../common/notifications.qh"
-       #include "../common/deathtypes.qh"
-       #include "../client/damage.qh"
-       #include "interpolate.qh"
-       #include "../client/teamradar.qh"
-       #include "../client/hud.qh"
-       #include "../client/scoreboard.qh"
-       #include "../client/waypointsprites.qh"
-       #include "../client/movetypes.qh"
-       #include "../client/prandom.qh"
-       #include "../client/bgmscript.qh"
-       #include "../client/noise.qh"
-       #include "../client/tturrets.qh"
-       #include "../server/tturrets/include/turrets_early.qh"
-       #include "../client/main.qh"
-       #include "../client/vehicles/vehicles.qh"
-       #include "../common/csqcmodel_settings.qh"
-       #include "common.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 void CSQCModel_Read(float isnew);
 
 #define CSQCMODEL_IF(cond)

diff --git a/qcsrc/csqcmodellib/cl_player.qh b/qcsrc/csqcmodellib/cl_player.qh
index 9c65db9be55d62ed6613eb0fe9cda371a4fcd6ef..f656d64f338d57b9e78b7aa202ef3b46d4ecfd56 100644 (file)
--- a/qcsrc/csqcmodellib/cl_player.qh
+++ b/qcsrc/csqcmodellib/cl_player.qh
@@ -22,60 +22,6 @@
 #ifndef CL_PLAYER_H
 #define CL_PLAYER_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "../client/command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../client/autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "../client/damage.qh"
-    #include "interpolate.qh"
-    #include "../client/teamradar.qh"
-    #include "../client/hud.qh"
-    #include "../client/scoreboard.qh"
-    #include "../client/waypointsprites.qh"
-    #include "../client/movetypes.qh"
-    #include "../client/prandom.qh"
-    #include "../client/bgmscript.qh"
-    #include "../client/noise.qh"
-    #include "../client/tturrets.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-    #include "../client/main.qh"
-    #include "../client/vehicles/vehicles.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "common.qh"
-    #include "cl_model.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 entity csqcplayer;
 float csqcplayer_status;
 const int CSQCPLAYERSTATUS_UNPREDICTED = 0;

diff --git a/qcsrc/csqcmodellib/common.qh b/qcsrc/csqcmodellib/common.qh
index 65973f53bdecb61d2d95412f8dfab7fee499a7ed..8b92221e78ec2a017d8c636652b0b20edaf30031 100644 (file)
--- a/qcsrc/csqcmodellib/common.qh
+++ b/qcsrc/csqcmodellib/common.qh
@@ -22,118 +22,6 @@
 #ifndef CSQCMODELLIB_COMMON_H
 #define CSQCMODELLIB_COMMON_H
 
-#if defined(CSQC)
-       #include "../common/util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "../common/constants.qh"
-       #include "../common/stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "../common/playerstats.qh"
-       #include "../common/teams.qh"
-       #include "../common/util.qh"
-       #include "../common/nades.qh"
-       #include "../common/buffs.qh"
-       #include "../common/test.qh"
-       #include "../common/counting.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "../common/mapinfo.qh"
-       #include "../common/command/markup.qh"
-       #include "../common/command/rpn.qh"
-       #include "../common/command/generic.qh"
-       #include "../common/command/shared_defs.qh"
-       #include "../common/urllib.qh"
-       #include "../common/animdecide.qh"
-       #include "../client/command/cl_cmd.qh"
-       #include "../common/monsters/monsters.qh"
-       #include "../client/autocvars.qh"
-       #include "../common/notifications.qh"
-       #include "../common/deathtypes.qh"
-       #include "../client/damage.qh"
-       #include "interpolate.qh"
-       #include "../client/teamradar.qh"
-       #include "../client/hud.qh"
-       #include "../client/scoreboard.qh"
-       #include "../client/waypointsprites.qh"
-       #include "../client/movetypes.qh"
-       #include "../client/prandom.qh"
-       #include "../client/bgmscript.qh"
-       #include "../client/noise.qh"
-       #include "../client/tturrets.qh"
-       #include "../server/tturrets/include/turrets_early.qh"
-       #include "../client/main.qh"
-       #include "../client/vehicles/vehicles.qh"
-       #include "../common/csqcmodel_settings.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../common/util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../server/weapons/accuracy.qh"
-    #include "../server/weapons/common.qh"
-    #include "../server/weapons/csqcprojectile.qh"
-    #include "../server/weapons/hitplot.qh"
-    #include "../server/weapons/selection.qh"
-    #include "../server/weapons/spawning.qh"
-    #include "../server/weapons/throwing.qh"
-    #include "../server/weapons/tracing.qh"
-    #include "../server/weapons/weaponstats.qh"
-    #include "../server/weapons/weaponsystem.qh"
-    #include "../server/t_items.qh"
-    #include "../server/autocvars.qh"
-    #include "../server/constants.qh"
-    #include "../server/defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "../server/mutators/mutators_include.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-    #include "../server/vehicles/vehicles_def.qh"
-    #include "../server/campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "../server/command/common.qh"
-    #include "../server/command/banning.qh"
-    #include "../server/command/radarmap.qh"
-    #include "../server/command/vote.qh"
-    #include "../server/command/getreplies.qh"
-    #include "../server/command/cmd.qh"
-    #include "../server/command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-#endif
-
 noref string csqcmodel_license = "\
 Copyright (c) 2011 Rudolf Polzer\
 \

diff --git a/qcsrc/csqcmodellib/interpolate.qh b/qcsrc/csqcmodellib/interpolate.qh
index 9dd1cc6d1cd81229d0634ca97ef24c2f1356e04c..912d83c87d257ebeabc0f842c58776bd1e551e51 100644 (file)
--- a/qcsrc/csqcmodellib/interpolate.qh
+++ b/qcsrc/csqcmodellib/interpolate.qh
@@ -22,44 +22,6 @@
 #ifndef INTERPOLATE_H
 #define INTERPOLATE_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "../client/command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../client/autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "../client/damage.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 .int iflags;
 const int IFLAG_VELOCITY = 1;
 const int IFLAG_ANGLES = 2;

diff --git a/qcsrc/csqcmodellib/settings.qh b/qcsrc/csqcmodellib/settings.qh
index 34376c39368506e87bd24d15f528982f2e5cb208..41a04feb593eb0124cc526071ebed169c097b219 100644 (file)
--- a/qcsrc/csqcmodellib/settings.qh
+++ b/qcsrc/csqcmodellib/settings.qh
@@ -1,3 +1,5 @@
+#ifndef CSQCMODELLIB_SETTINGS_H
+#define CSQCMODELLIB_SETTINGS_H
 // define this if svqc code wants to use .frame2 and .lerpfrac
 //#define CSQCMODEL_HAVE_TWO_FRAMES
 
@@ -25,3 +27,4 @@ const float CSQCPLAYER_FORCE_UPDATES = 0.25;
 //vector PL_CROUCH_MIN  = ...;
 //vector PL_CROUCH_MAX  = ...;
 //vector PL_CROUCH_VIEW_OFS  = ...;
+#endif
\ No newline at end of file

diff --git a/qcsrc/csqcmodellib/sv_model.qh b/qcsrc/csqcmodellib/sv_model.qh
index a9e9ea733713b9b4ff4e756a2f8a5f6c771c8eb2..c9af594cfe549347485b461d43357b666bcebd00 100644 (file)
--- a/qcsrc/csqcmodellib/sv_model.qh
+++ b/qcsrc/csqcmodellib/sv_model.qh
@@ -22,72 +22,6 @@
  * IN THE SOFTWARE.
  */
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../common/util-pre.qh"
-       #include "../server/sys-pre.qh"
-       #include "../dpdefs/progsdefs.qh"
-       #include "../dpdefs/dpextensions.qh"
-       #include "../server/sys-post.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/util_server.qh"
-       #include "../warpzonelib/server.qh"
-       #include "../common/constants.qh"
-       #include "../common/stats.qh"
-       #include "../common/teams.qh"
-       #include "../common/util.qh"
-       #include "../common/nades.qh"
-       #include "../common/buffs.qh"
-       #include "../common/test.qh"
-       #include "../common/counting.qh"
-       #include "../common/urllib.qh"
-       #include "../common/command/markup.qh"
-       #include "../common/command/rpn.qh"
-       #include "../common/command/generic.qh"
-       #include "../common/command/shared_defs.qh"
-       #include "../common/net_notice.qh"
-       #include "../common/animdecide.qh"
-       #include "../common/monsters/monsters.qh"
-       #include "../common/monsters/sv_monsters.qh"
-       #include "../common/monsters/spawn.qh"
-       #include "../common/weapons/config.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "../server/weapons/accuracy.qh"
-       #include "../server/weapons/common.qh"
-       #include "../server/weapons/csqcprojectile.qh"
-       #include "../server/weapons/hitplot.qh"
-       #include "../server/weapons/selection.qh"
-       #include "../server/weapons/spawning.qh"
-       #include "../server/weapons/throwing.qh"
-       #include "../server/weapons/tracing.qh"
-       #include "../server/weapons/weaponstats.qh"
-       #include "../server/weapons/weaponsystem.qh"
-       #include "../server/t_items.qh"
-       #include "../server/autocvars.qh"
-       #include "../server/constants.qh"
-       #include "../server/defs.qh"
-       #include "../common/notifications.qh"
-       #include "../common/deathtypes.qh"
-       #include "../server/mutators/mutators_include.qh"
-       #include "../server/tturrets/include/turrets_early.qh"
-       #include "../server/vehicles/vehicles_def.qh"
-       #include "../server/campaign.qh"
-       #include "../common/campaign_common.qh"
-       #include "../common/mapinfo.qh"
-       #include "../server/command/common.qh"
-       #include "../server/command/banning.qh"
-       #include "../server/command/radarmap.qh"
-       #include "../server/command/vote.qh"
-       #include "../server/command/getreplies.qh"
-       #include "../server/command/cmd.qh"
-       #include "../server/command/sv_cmd.qh"
-       #include "../common/csqcmodel_settings.qh"
-       #include "common.qh"
-#endif
-
 // generic CSQC model code
 
 void CSQCModel_CheckUpdate();

diff --git a/qcsrc/dpdefs/keycodes.qh b/qcsrc/dpdefs/keycodes.qh
index 9ed47ec96f324fc576074defd06614fbb2cbf729..6c562fcb427d1f03e49a16293409d6c4c56f00bd 100644 (file)
--- a/qcsrc/dpdefs/keycodes.qh
+++ b/qcsrc/dpdefs/keycodes.qh
@@ -1,11 +1,6 @@
 #ifndef KEYCODES_H
 #define KEYCODES_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 ///////////////////////////
 // key constants
 

diff --git a/qcsrc/dpdefs/menudefs.qh b/qcsrc/dpdefs/menudefs.qh
index 94ac814ae7019ec677fcfc0dfb60638482e6a7d9..99d88ba2ce7f9c01b064c986fbe6857d4765ef9f 100644 (file)
--- a/qcsrc/dpdefs/menudefs.qh
+++ b/qcsrc/dpdefs/menudefs.qh
@@ -1,11 +1,6 @@
 #ifndef MENUDEFS_H
 #define MENUDEFS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 //////////////////////////////////////////////////////////
 // sys globals
 

diff --git a/qcsrc/menu/command/menu_cmd.qh b/qcsrc/menu/command/menu_cmd.qh
index e763813d0d18b6d0a727a4952fc6dfa9e78d9b84..0a94a9a4ba922fb48cc997214e12a5ce73f89ac2 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qh
+++ b/qcsrc/menu/command/menu_cmd.qh
@@ -1,33 +1,5 @@
 #ifndef MENU_CMD_H
 #define MENU_CMD_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../sys-post.qh"
-    #include "../config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../common/util.qh"
-    #include "../../common/test.qh"
-    #include "../oo/base.qh"
-    #include "../../common/playerstats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/mapinfo.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/monsters/monsters.qh"
-#elif defined(SVQC)
-#endif
-
 void GameCommand(string command);
 #endif
\ No newline at end of file

diff --git a/qcsrc/menu/config.qh b/qcsrc/menu/config.qh
index 868a6d67b99486ccc62de044f9ff0ac9e29566a3..86203cfddef472b7927455e145f279e970942bfd 100644 (file)
--- a/qcsrc/menu/config.qh
+++ b/qcsrc/menu/config.qh
@@ -1,14 +1,4 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "sys-post.qh"
-#elif defined(SVQC)
-#endif
-
 #endif
\ No newline at end of file

diff --git a/qcsrc/menu/draw.qh b/qcsrc/menu/draw.qh
index 50608d1f5cfe1553bbaa41d7b71c0b0bb61f71ea..ec8f858fdbde7dba8a5602f1fd9f0e4af5c59d3e 100644 (file)
--- a/qcsrc/menu/draw.qh
+++ b/qcsrc/menu/draw.qh
@@ -1,36 +1,6 @@
 #ifndef DRAW_H
 #define DRAW_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "sys-post.qh"
-    #include "config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../common/util.qh"
-    #include "../common/test.qh"
-    #include "oo/base.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/constants.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/counting.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "command/menu_cmd.qh"
-    #include "menu.qh"
-#elif defined(SVQC)
-#endif
-
 // from the engine
 vector drawfontscale;
 #define draw_fontscale drawfontscale

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index 2e24d620417a777d4a8852586f0f85d060ac3737..47b2ed9dd149c8138d02e4b5e5216d3c89d0a7be 100644 (file)
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -1,35 +1,6 @@
 #ifndef MENU_H
 #define MENU_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "sys-post.qh"
-    #include "config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../common/util.qh"
-    #include "../common/test.qh"
-    #include "oo/base.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/constants.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/counting.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "command/menu_cmd.qh"
-#elif defined(SVQC)
-#endif
-
 #define localcmd cmd
 
 #define NULL (null_entity)

diff --git a/qcsrc/menu/oo/base.qh b/qcsrc/menu/oo/base.qh
index cf966c68cfc48757832073a401a7671bd31e9b4b..ba8db395919e351b8932be888a06d7c9c31ac7b2 100644 (file)
--- a/qcsrc/menu/oo/base.qh
+++ b/qcsrc/menu/oo/base.qh
@@ -1,20 +1,6 @@
 #ifndef BASE_H
 #define BASE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-       #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../sys-post.qh"
-    #include "../config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../common/util.qh"
-    #include "../../common/test.qh"
-#elif defined(SVQC)
-#endif
-
 .string classname;
 entity Object_vtbl;
 .string vtblname;

diff --git a/qcsrc/menu/oo/implementation.qh b/qcsrc/menu/oo/implementation.qh
index 22668c797bc76977ce377ab07a2ec577e7b0fe10..6eced2f97bcb30f826ede3db7ab09c3542047d87 100644 (file)
--- a/qcsrc/menu/oo/implementation.qh
+++ b/qcsrc/menu/oo/implementation.qh
@@ -1,40 +1,6 @@
 #ifndef IMPLEMENTATION_H
 #define IMPLEMENTATION_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../sys-post.qh"
-    #include "../config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../common/util.qh"
-    #include "../../common/test.qh"
-    #include "base.qh"
-    #include "../../common/playerstats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/mapinfo.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../command/menu_cmd.qh"
-    #include "../menu.qh"
-    #include "../draw.qh"
-    #include "../skin.qh"
-    #include "../xonotic/util.qh"
-    #include "interface.qh"
-#elif defined(SVQC)
-#endif
-
 #ifndef INTERFACE
 #define INTERFACE
 #endif

diff --git a/qcsrc/menu/oo/interface.qh b/qcsrc/menu/oo/interface.qh
index db572d46711092e2667ba6bb073388950b1a55f4..cdc469a5e3464d7b80f88c0b8619b57c0c198a0a 100644 (file)
--- a/qcsrc/menu/oo/interface.qh
+++ b/qcsrc/menu/oo/interface.qh
@@ -1,39 +1,6 @@
 #ifndef INTERFACE_H
 #define INTERFACE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../sys-post.qh"
-    #include "../config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../common/util.qh"
-    #include "../../common/test.qh"
-    #include "base.qh"
-    #include "../../common/playerstats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/mapinfo.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../command/menu_cmd.qh"
-    #include "../menu.qh"
-    #include "../draw.qh"
-    #include "../skin.qh"
-    #include "../xonotic/util.qh"
-#elif defined(SVQC)
-#endif
-
 #ifndef INTERFACE
 #define INTERFACE
 #endif

diff --git a/qcsrc/menu/skin.qh b/qcsrc/menu/skin.qh
index 0eabcae611f2bb1a8cdcc232c410ead5b5d7c419..f19256833a98ae59fcefc0e35e446cbbc43cb8c9 100644 (file)
--- a/qcsrc/menu/skin.qh
+++ b/qcsrc/menu/skin.qh
@@ -1,37 +1,6 @@
 #ifndef SKIN_H
 #define SKIN_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "sys-post.qh"
-    #include "config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../common/util.qh"
-    #include "../common/test.qh"
-    #include "oo/base.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/constants.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/counting.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "command/menu_cmd.qh"
-    #include "menu.qh"
-    #include "draw.qh"
-#elif defined(SVQC)
-#endif
-
 #define SKINBEGIN
 #define SKINVECTOR(name,def) vector SKIN##name = def
 #define SKINFLOAT(name,def) float SKIN##name = def

diff --git a/qcsrc/menu/sys-post.qh b/qcsrc/menu/sys-post.qh
index aea16a76f8ca8c81350521aa21474ef272df59b5..aaa78d9ba2e606b06dcbb320cd11dab983e7638e 100644 (file)
--- a/qcsrc/menu/sys-post.qh
+++ b/qcsrc/menu/sys-post.qh
@@ -1,14 +1,5 @@
 #ifndef SYS_POST_H
 #define SYS_POST_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-#elif defined(SVQC)
-#endif
-
 #pragma noref 0
 #endif
\ No newline at end of file

diff --git a/qcsrc/menu/sys-pre.qh b/qcsrc/menu/sys-pre.qh
index 3122cdf57771eebe053722a8f2e861350b75fdec..8fa3faae4238a830e6b4b312219f77fd2e561331 100644 (file)
--- a/qcsrc/menu/sys-pre.qh
+++ b/qcsrc/menu/sys-pre.qh
@@ -1,11 +1,5 @@
 #ifndef SYS_PRE_H
 #define SYS_PRE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../common/util-pre.qh"
-#elif defined(SVQC)
-#endif
-
 #pragma noref 1
 #endif
\ No newline at end of file

diff --git a/qcsrc/menu/xonotic/util.qh b/qcsrc/menu/xonotic/util.qh
index eacb19fe67e8f661d1ed7bc812746691eb351b52..3f24d1d84ad5036591ed22d22892be517c190326 100644 (file)
--- a/qcsrc/menu/xonotic/util.qh
+++ b/qcsrc/menu/xonotic/util.qh
@@ -1,36 +1,5 @@
 #ifndef MENU_UTIL_H
 #define MENU_UTIL_H
-#if defined(CSQC)
-#elif defined(MENUQC)
-       #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/menudefs.qh"
-    #include "../../dpdefs/keycodes.qh"
-    #include "../sys-post.qh"
-    #include "../config.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../common/util.qh"
-    #include "../../common/test.qh"
-    #include "../oo/base.qh"
-    #include "../../common/playerstats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/mapinfo.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../command/menu_cmd.qh"
-    #include "../menu.qh"
-    #include "../draw.qh"
-    #include "../skin.qh"
-#elif defined(SVQC)
-#endif
 
 float GL_CheckExtension(string ext);
 float GL_Have_TextureCompression();

diff --git a/qcsrc/server/anticheat.qh b/qcsrc/server/anticheat.qh
index 28fbe67009b34b0aa7759ab55e758a58b8c7e56d..33fd0ddec26ff615dba46ca5a2b770322042fee2 100644 (file)
--- a/qcsrc/server/anticheat.qh
+++ b/qcsrc/server/anticheat.qh
@@ -1,73 +1,6 @@
 #ifndef ANTICHEAT_H
 #define ANTICHEAT_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-#endif
-
 void anticheat_init();
 void anticheat_report();
 void anticheat_shutdown();

diff --git a/qcsrc/server/antilag.qh b/qcsrc/server/antilag.qh
index 59d461111fdd2002b701a23d54d9c556a52fb86a..d02a963115553297564ffd3907d316fc307e31e5 100644 (file)
--- a/qcsrc/server/antilag.qh
+++ b/qcsrc/server/antilag.qh
@@ -1,83 +1,6 @@
 #ifndef ANTILAG_H
 #define ANTILAG_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-    #include "mapvoting.qh"
-    #include "ipban.qh"
-    #include "race.qh"
-#endif
-
 void antilag_record(entity e, float t);
 vector antilag_takebackorigin(entity e, float t);
 vector antilag_takebackavgvelocity(entity e, float t0, float t1);

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 520460e8f28421b9122e8cd0bd969a065045411e..e8266948acb07218ee44d9a72a881e8c4b72c2a0 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1,52 +1,6 @@
 #ifndef SERVER_AUTOCVARS_H
 #define SERVER_AUTOCVARS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-#endif
-
 bool autocvar__notarget;
 bool autocvar__independent_players;
 bool autocvar__campaign_testrun;

diff --git a/qcsrc/server/bot/aim.qh b/qcsrc/server/bot/aim.qh
index 8442aa0fedfb5bb424675d0b2994ac75eccd907b..eafd2d2f73a9e90dce99bf4db1e5b9b886f068b6 100644 (file)
--- a/qcsrc/server/bot/aim.qh
+++ b/qcsrc/server/bot/aim.qh
@@ -1,3 +1,5 @@
+#ifndef AIM_H
+#define AIM_H
 /*
  * Globals and Fields
  */
@@ -95,3 +97,4 @@ float findtrajectorywithleading(vector org, vector m1, vector m2, entity targ, f
 vector bot_shotlead(vector targorigin, vector targvelocity, float shotspeed, float shotdelay);
 
 .void(float t, float f1, float f2, entity e1, vector v1, vector v2, vector v3, vector v4) lag_func;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/bot/bot.qh b/qcsrc/server/bot/bot.qh
index 8feedfb26e0507d76bcb3588cd44b70d20fe6514..8eafb93baa3b26e695e539d3a47fd0542e782376 100644 (file)
--- a/qcsrc/server/bot/bot.qh
+++ b/qcsrc/server/bot/bot.qh
@@ -1,3 +1,5 @@
+#ifndef BOT_H
+#define BOT_H
 /*
  * Globals and Fields
  */
@@ -116,3 +118,4 @@ void CheckAllowedTeams(entity for_whom); void GetTeamCounts(entity other);
 float JoinBestTeam(entity pl, float only_return_best, float forcebestteam);
 
 void bot_calculate_stepheightvec(void);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/bot/havocbot/havocbot.qh b/qcsrc/server/bot/havocbot/havocbot.qh
index de94691822e902631b6bbe732162d5bb22270d92..467e5fc2edbcb65bb8d9589d12fb1d7fa61ba5ee 100644 (file)
--- a/qcsrc/server/bot/havocbot/havocbot.qh
+++ b/qcsrc/server/bot/havocbot/havocbot.qh
@@ -1,3 +1,6 @@
+#ifndef HAVOCBOT_H
+#define HAVOCBOT_H
+
 /*
  * Globals and Fields
  */
@@ -60,4 +63,4 @@ void(float ratingscale, vector org, float sradius) havocbot_goalrating_enemyplay
 .entity draggedby;
 .float ladder_time;
 .entity ladder_entity;
-
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/bot/navigation.qh b/qcsrc/server/bot/navigation.qh
index 24d01c7c44f9adfee93013c0ca34fd3e496f61c5..10d32ce18cf5fd624d3141551f9b9245fadfd489 100644 (file)
--- a/qcsrc/server/bot/navigation.qh
+++ b/qcsrc/server/bot/navigation.qh
@@ -1,3 +1,5 @@
+#ifndef NAVIGATION_H
+#define NAVIGATION_H
 /*
  * Globals and Fields
  */
@@ -74,3 +76,4 @@ void navigation_unstuck();
 void botframe_updatedangerousobjects(float maxupdate);
 
 entity navigation_findnearestwaypoint(entity ent, float walkfromwp);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/bot/waypoints.qh b/qcsrc/server/bot/waypoints.qh
index c43b66de66724a21fd54acafec34d8a42f68ecc3..c2f1d86f73f8f1d0d1e701626a88d0aaf063d84a 100644 (file)
--- a/qcsrc/server/bot/waypoints.qh
+++ b/qcsrc/server/bot/waypoints.qh
@@ -1,3 +1,5 @@
+#ifndef WAYPOINTS_H
+#define WAYPOINTS_H
 /*
  * Globals and Fields
  */
@@ -62,3 +64,4 @@ entity waypoint_spawnpersonal(vector position);
 vector waypoint_fixorigin(vector position);
 
 void botframe_autowaypoints();
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/campaign.qh b/qcsrc/server/campaign.qh
index f7fbd9a6c875b23d69d43e106e19a4013ba45da0..b107729efb783e38b6524affda61f1857f8e86c2 100644 (file)
--- a/qcsrc/server/campaign.qh
+++ b/qcsrc/server/campaign.qh
@@ -1,58 +1,5 @@
 #ifndef CAMPAIGN_H
 #define CAMPAIGN_H
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-#endif
 
 // this must be included BEFORE campaign_common.h to make this a memory saving
 #define CAMPAIGN_MAX_ENTRIES 2

diff --git a/qcsrc/server/cheats.qh b/qcsrc/server/cheats.qh
index 1560100521366ae72b5d361fdd2bb04d6d08921d..925033c8012b00e917e94034ca42c72a7d11c0d8 100644 (file)
--- a/qcsrc/server/cheats.qh
+++ b/qcsrc/server/cheats.qh
@@ -1,74 +1,6 @@
 #ifndef CHEATS_H
 #define CHEATS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-#endif
-
 //float autocvar_sv_cheats; // must... declare... global
 
 float cheatcount_total;

diff --git a/qcsrc/server/command/banning.qh b/qcsrc/server/command/banning.qh
index b00c8390bd1b78a27ae3277a223ce29e4605e6b1..3386d57696563b09ee0ef7bc8273a3d893accde6 100644 (file)
--- a/qcsrc/server/command/banning.qh
+++ b/qcsrc/server/command/banning.qh
@@ -1,64 +1,6 @@
 #ifndef BANNING_H
 #define BANNING_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include "../t_items.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../mutators/mutators_include.qh"
-    #include "../tturrets/include/turrets_early.qh"
-    #include "../vehicles/vehicles_def.qh"
-    #include "../campaign.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/mapinfo.qh"
-    #include "common.qh"
-#endif
-
 // ====================================
 //  Declarations for kick/ban commands
 //  Last updated: December 29th, 2011

diff --git a/qcsrc/server/command/cmd.qh b/qcsrc/server/command/cmd.qh
index 123ce0302e49a9635593f7e6e61dfd75186bbb83..490361b45de2cdf7cf277d5266b1ee86a405dae9 100644 (file)
--- a/qcsrc/server/command/cmd.qh
+++ b/qcsrc/server/command/cmd.qh
@@ -1,68 +1,6 @@
 #ifndef CMD_H
 #define CMD_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include "../t_items.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../mutators/mutators_include.qh"
-    #include "../tturrets/include/turrets_early.qh"
-    #include "../vehicles/vehicles_def.qh"
-    #include "../campaign.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/mapinfo.qh"
-    #include "common.qh"
-    #include "banning.qh"
-    #include "radarmap.qh"
-    #include "vote.qh"
-    #include "getreplies.qh"
-#endif
-
 // =================================================
 //  Declarations for server side networked commands
 //  Last updated: December 26th, 2011

diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh
index 2b2aaaf3736b48fd3781b26fe1d4763b3f4b1290..a11ea856a9a79cdc4903b7c30416bc3f72379b51 100644 (file)
--- a/qcsrc/server/command/common.qh
+++ b/qcsrc/server/command/common.qh
@@ -1,63 +1,6 @@
 #ifndef COMMAND_COMMON_H
 #define COMMAND_COMMON_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include "../t_items.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../mutators/mutators_include.qh"
-    #include "../tturrets/include/turrets_early.qh"
-    #include "../vehicles/vehicles_def.qh"
-    #include "../campaign.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/mapinfo.qh"
-#endif
-
 // ============================================================
 //  Shared declarations for server commands, written by Samual
 //  Last updated: December 30th, 2011

diff --git a/qcsrc/server/command/getreplies.qh b/qcsrc/server/command/getreplies.qh
index 12dcd0ad33982fddd37dedaa19a3bcc68de9ec63..77ed76024c70ab67f0bed8778626240c73024f35 100644 (file)
--- a/qcsrc/server/command/getreplies.qh
+++ b/qcsrc/server/command/getreplies.qh
@@ -1,22 +1,6 @@
 #ifndef GETREPLIES_H
 #define GETREPLIES_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/util.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../defs.qh"
-    #include "../../common/mapinfo.qh"
-    #include "getreplies.qh"
-    #include "../race.qh"
-#endif
-
 // ======================================================
 //  Declarations for reply messages, re-worked by Samual
 //  Last updated: December 30th, 2011

diff --git a/qcsrc/server/command/radarmap.qh b/qcsrc/server/command/radarmap.qh
index ea6d202facf442669ea4d61e73a22f6439fe9255..d3a97dd491f8be9ed04db239afa065c450d5e919 100644 (file)
--- a/qcsrc/server/command/radarmap.qh
+++ b/qcsrc/server/command/radarmap.qh
@@ -1,65 +1,6 @@
 #ifndef RADARMAP_H
 #define RADARMAP_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include "../t_items.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../mutators/mutators_include.qh"
-    #include "../tturrets/include/turrets_early.qh"
-    #include "../vehicles/vehicles_def.qh"
-    #include "../campaign.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/mapinfo.qh"
-    #include "common.qh"
-    #include "banning.qh"
-#endif
-
 // ===========================================
 //     Declarations for radarmap generation code
 // ===========================================

diff --git a/qcsrc/server/command/sv_cmd.qh b/qcsrc/server/command/sv_cmd.qh
index 159a2a0b1c578104f8a81dbc275cfe9ee8c7cae1..94b254a2626db7ac620c74a038d3031a2a249e1d 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qh
+++ b/qcsrc/server/command/sv_cmd.qh
@@ -1,69 +1,6 @@
 #ifndef SV_CMD_H
 #define SV_CMD_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include "../t_items.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../mutators/mutators_include.qh"
-    #include "../tturrets/include/turrets_early.qh"
-    #include "../vehicles/vehicles_def.qh"
-    #include "../campaign.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/mapinfo.qh"
-    #include "common.qh"
-    #include "banning.qh"
-    #include "radarmap.qh"
-    #include "vote.qh"
-    #include "getreplies.qh"
-    #include "cmd.qh"
-#endif
-
 // =================================================
 //  Declarations for server side game commands
 //  Last updated: December 25th, 2011

diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh
index 8f130842ce6b11e4f84b0c88126081ddbf1aaa96..03e535977dfcacc450337235aa767117d9f7b9af 100644 (file)
--- a/qcsrc/server/command/vote.qh
+++ b/qcsrc/server/command/vote.qh
@@ -1,29 +1,6 @@
 #ifndef VOTE_H
 #define VOTE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/util.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../mutators/mutators_include.qh"
-    #include "../../common/mapinfo.qh"
-    #include "common.qh"
-    #include "vote.qh"
-    #include "../../common/playerstats.qh"
-    #include "../scores.qh"
-    #include "../race.qh"
-    #include "../round_handler.qh"
-#endif
-
 // ================================================
 //  Declarations for the vote system/vote commands
 //  Last updated: December 14th, 2011

diff --git a/qcsrc/server/constants.qh b/qcsrc/server/constants.qh
index a3c957d7faeb6f3c582d1e9d78186833b9e600bd..91e460eca7d734840f5dbe05641c232e2f0342a2 100644 (file)
--- a/qcsrc/server/constants.qh
+++ b/qcsrc/server/constants.qh
@@ -1,53 +1,6 @@
 #ifndef SERVER_CONSTANTS_H
 #define SERVER_CONSTANTS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-#endif
-
 const float FL_WEAPON = 8192;
 const float FL_POWERUP = 16384;
 const float FL_PROJECTILE = 32768;

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index e8b7ce5f9f3501b219043531a2ec21e930e9633c..a761c5b9ab3b7a2bbd052310536ce0ade4af99c8 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -1,54 +1,6 @@
 #ifndef SERVER_DEFS_H
 #define SERVER_DEFS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-#endif
-
 #define INDEPENDENT_ATTACK_FINISHED
 
 noref float require_spawnfunc_prefix; // if this float exists, only functions with spawnfunc_ name prefix qualify as spawn functions

diff --git a/qcsrc/server/g_hook.qh b/qcsrc/server/g_hook.qh
index 9a1216ceaea398a4c8e5fd755ce082023868ce09..55bbdd0e0838d4a20b698e9f4e726a1d16729747 100644 (file)
--- a/qcsrc/server/g_hook.qh
+++ b/qcsrc/server/g_hook.qh
@@ -1,25 +1,6 @@
 #ifndef HOOK_H
 #define HOOK_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/util.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "command/common.qh"
-    #include "g_hook.qh"
-    #include "round_handler.qh"
-#endif
-
 // Wazat's grappling hook
 .entity                hook;
 void GrapplingHookFrame();

diff --git a/qcsrc/server/ipban.qh b/qcsrc/server/ipban.qh
index a33ca3f31f49dcd6d111c8a026362e3bbabfbedc..9be8b3d721d6b54cbc37c33238e823711b13a934 100644 (file)
--- a/qcsrc/server/ipban.qh
+++ b/qcsrc/server/ipban.qh
@@ -1,81 +1,6 @@
 #ifndef IPBAN_H
 #define IPBAN_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-    #include "mapvoting.qh"
-#endif
-
 void Ban_SaveBans();
 void Ban_LoadBans();
 float Ban_MaybeEnforceBan(entity client);

diff --git a/qcsrc/server/item_key.qh b/qcsrc/server/item_key.qh
index 446be4e5305e3e0b7f9b44587366deb79769ad3a..4ec3296df32aecdccebff8a7642541021d2cca61 100644 (file)
--- a/qcsrc/server/item_key.qh
+++ b/qcsrc/server/item_key.qh
@@ -1,86 +1,6 @@
 #ifndef ITEM_KEY
 #define ITEM_KEY
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-    #include "mapvoting.qh"
-    #include "ipban.qh"
-    #include "race.qh"
-    #include "antilag.qh"
-    #include "playerdemo.qh"
-    #include "round_handler.qh"
-#endif
-
 /**
  * Returns the bit ID of a key
  */

diff --git a/qcsrc/server/mapvoting.qh b/qcsrc/server/mapvoting.qh
index f52190311a182b68e0325fe59f6175ad05926a79..4c9360fc5ef0ed219a26d7ecb4faa378aab1f021 100644 (file)
--- a/qcsrc/server/mapvoting.qh
+++ b/qcsrc/server/mapvoting.qh
@@ -1,80 +1,6 @@
 #ifndef MAPVOTING_H
 #define MAPVOTING_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-#endif
-
 // definitions for functions used outside mapvoting.qc
 void MapVote_Start();
 void MapVote_Spawn();

diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh
index d7102cb81a62bc5f7080fac41c283b89a1ceebbb..0b3868a28e55acb9969c33ba7f556a8acd1b20c3 100644 (file)
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@ -1,3 +1,5 @@
+#ifndef MUTATORS_BASE_H
+#define MUTATORS_BASE_H
 const float CBC_ORDER_EXCLUSIVE = 3;
 const float CBC_ORDER_FIRST = 1;
 const float CBC_ORDER_LAST = 2;
@@ -375,3 +377,4 @@ MUTATOR_HOOKABLE(AccuracyTargetValid);
        const float MUT_ACCADD_VALID = 0; // return this flag to make the function continue if target is a client
        const float MUT_ACCADD_INVALID = 1; // return this flag to make the function always continue
        const float MUT_ACCADD_INDIFFERENT = 2; // return this flag to make the function always return
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_assault.qh b/qcsrc/server/mutators/gamemode_assault.qh
index 00b8e98a567c88bc704be85693e77caf3655f71a..6f306ae383781c212b3e45649d938f884e65c396 100644 (file)
--- a/qcsrc/server/mutators/gamemode_assault.qh
+++ b/qcsrc/server/mutators/gamemode_assault.qh
@@ -1,3 +1,5 @@
+#ifndef GAMEMODE_ASSAULT_H
+#define GAMEMODE_ASSAULT_H
 // sprites
 .entity assault_decreaser;
 .entity assault_sprite;
@@ -28,4 +30,5 @@ const float SP_ASSAULT_OBJECTIVES = 4;
 
 // predefined spawnfuncs
 void spawnfunc_func_breakable();
-void target_objective_decrease_activate();
\ No newline at end of file
+void target_objective_decrease_activate();
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_ca.qh b/qcsrc/server/mutators/gamemode_ca.qh
index a7c1edfc53870a43666b596eac2f533dc2ebab7b..a0f361fec576507379ea5526056005f774e1e71a 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ca.qh
+++ b/qcsrc/server/mutators/gamemode_ca.qh
@@ -1,2 +1,5 @@
+#ifndef GAMEMODE_CA_H
+#define GAMEMODE_CA_H
 // should be removed in the future, as other code should not have to care
 .float caplayer; // 0.5 if scheduled to join the next round
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh
index 002a434ecf6a230d7bd73cc955b30059104ffd4d..44caa7bdc55aecdac37d39bbadba52ef2b9d5b3a 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -1,3 +1,5 @@
+#ifndef GAMEMODE_CTF_H
+#define GAMEMODE_CTF_H
 // these are needed since mutators are compiled last
 
 #ifdef SVQC
@@ -132,3 +134,4 @@ float havocbot_ctf_middlepoint_radius;
 
 void havocbot_role_ctf_setrole(entity bot, float role);
 #endif
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_cts.qh b/qcsrc/server/mutators/gamemode_cts.qh
index 575b1fae8e0c4be5aad238a163d38d9f9be4dc8c..b8a075b1d34cc67744edf546167d08adeaff435e 100644 (file)
--- a/qcsrc/server/mutators/gamemode_cts.qh
+++ b/qcsrc/server/mutators/gamemode_cts.qh
@@ -1,3 +1,5 @@
+#ifndef GAMEMODE_CTS_H
+#define GAMEMODE_CTS_H
 //float g_race_qualifying;
 
 // scores
@@ -5,3 +7,4 @@ const float ST_CTS_LAPS = 1;
 const float SP_CTS_LAPS = 4;
 const float SP_CTS_TIME = 5;
 const float SP_CTS_FASTEST = 6;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_domination.qh b/qcsrc/server/mutators/gamemode_domination.qh
index a0cd99e1cc0c317453de0d450becad565cbf2646..f0d3cd3560825d818c0a339b73daad5c728382a5 100644 (file)
--- a/qcsrc/server/mutators/gamemode_domination.qh
+++ b/qcsrc/server/mutators/gamemode_domination.qh
@@ -1,3 +1,5 @@
+#ifndef GAMEMODE_DOMINATION_H
+#define GAMEMODE_DOMINATION_H
 // these are needed since mutators are compiled last
 
 // score rule declarations
@@ -27,3 +29,4 @@ float pps_pink;
 // misc globals
 float domination_roundbased;
 float domination_teams;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_invasion.qh b/qcsrc/server/mutators/gamemode_invasion.qh
index aa28a2517d612ba9b7463dca350bcefaaf000bbc..0162f5d7aae312b7384777fc91897b8be1d1ac24 100644 (file)
--- a/qcsrc/server/mutators/gamemode_invasion.qh
+++ b/qcsrc/server/mutators/gamemode_invasion.qh
@@ -1,3 +1,6 @@
+#ifndef GAMEMODE_INVASION_H
+#define GAMEMODE_INVASION_H
+
 float inv_numspawned;
 float inv_maxspawned;
 float inv_roundcnt;
@@ -12,3 +15,4 @@ float inv_monsters_perteam[17];
 float inv_monsterskill;
 
 const float ST_INV_KILLS = 1;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_keepaway.qh b/qcsrc/server/mutators/gamemode_keepaway.qh
index 98b492e55d1a845744aef3b076a34f7d59b6a03e..68ea788bb52f1cb02c6aad717f43a31187de48e1 100644 (file)
--- a/qcsrc/server/mutators/gamemode_keepaway.qh
+++ b/qcsrc/server/mutators/gamemode_keepaway.qh
@@ -1,3 +1,6 @@
+#ifndef GAMEMODE_KEEPAWAY_H
+#define GAMEMODE_KEEPAWAY_H
+
 // these are needed since mutators are compiled last
 
 entity ka_ball;
@@ -8,3 +11,4 @@ const float SP_KEEPAWAY_BCTIME = 6;
 
 void() havocbot_role_ka_carrier;
 void() havocbot_role_ka_collector;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_keyhunt.qh b/qcsrc/server/mutators/gamemode_keyhunt.qh
index 611f7f065e10be5eda8f984c10166c76ea99fdf6..c683e71fba8befe3872dd419dcd453ff1129629d 100644 (file)
--- a/qcsrc/server/mutators/gamemode_keyhunt.qh
+++ b/qcsrc/server/mutators/gamemode_keyhunt.qh
@@ -1,5 +1,7 @@
-// ALL OF THESE should be removed in the future, as other code should not have
-// to care
+#ifndef GAMEMODE_KEYHUNT_H
+#define GAMEMODE_KEYHUNT_H
+
+// ALL OF THESE should be removed in the future, as other code should not have to care
 
 // used by bots:
 float kh_tracking_enabled;
@@ -9,3 +11,4 @@ float kh_Key_AllOwnedByWhichTeam();
 typedef void(void) kh_Think_t;
 void kh_StartRound();
 void kh_Controller_SetThink(float t, kh_Think_t func);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_lms.qh b/qcsrc/server/mutators/gamemode_lms.qh
index 195c4aac3f9174e74eef5c4347a344a1818293f6..9bb92c0f2abb82dd13b50adc5081109847051cea 100644 (file)
--- a/qcsrc/server/mutators/gamemode_lms.qh
+++ b/qcsrc/server/mutators/gamemode_lms.qh
@@ -1,3 +1,6 @@
+#ifndef GAMEMODE_LMS_H
+#define GAMEMODE_LMS_H
+
 // scoreboard stuff
 const float SP_LMS_LIVES = 4;
 const float SP_LMS_RANK = 5;
@@ -5,4 +8,5 @@ const float SP_LMS_RANK = 5;
 // lives related defs
 float lms_lowest_lives;
 float lms_next_place;
-float LMS_NewPlayerLives();
\ No newline at end of file
+float LMS_NewPlayerLives();
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_nexball.qh b/qcsrc/server/mutators/gamemode_nexball.qh
index 5a01d4073cdfdefc5afd16e8533ca4eca7ada9c3..9cdb6b771a2bde82ba89181b9d010125219b10d8 100644 (file)
--- a/qcsrc/server/mutators/gamemode_nexball.qh
+++ b/qcsrc/server/mutators/gamemode_nexball.qh
@@ -1,3 +1,6 @@
+#ifndef GAMEMODE_NEXBALL_H
+#define GAMEMODE_NEXBALL_H
+
 //EF_BRIGHTFIELD|EF_BRIGHTLIGHT|EF_DIMLIGHT|EF_BLUE|EF_RED|EF_FLAME
 const float BALL_EFFECTMASK = 1229;
 const vector BALL_MINS = '-16 -16 -16'; // The model is 24*24*24
@@ -31,3 +34,4 @@ float nb_teams;
 .float nb_droptime;
 
 .float teamtime;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/gamemode_race.qh b/qcsrc/server/mutators/gamemode_race.qh
index b8b052daaa880aa1e317e896ee1ff9ec8a55ed1b..4631fd43a151d283e406f997c97891d3cae2a421 100644 (file)
--- a/qcsrc/server/mutators/gamemode_race.qh
+++ b/qcsrc/server/mutators/gamemode_race.qh
@@ -1,3 +1,6 @@
+#ifndef GAMEMODE_RACE_H
+#define GAMEMODE_RACE_H
+
 float g_race_qualifying;
 float race_teams;
 
@@ -6,3 +9,4 @@ const float ST_RACE_LAPS = 1;
 const float SP_RACE_LAPS = 4;
 const float SP_RACE_TIME = 5;
 const float SP_RACE_FASTEST = 6;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/mutator_buffs.qh b/qcsrc/server/mutators/mutator_buffs.qh
index afb34fa9db0b5e656fd918204c0b5660a50541df..591c81b34e3fdd1732dc8c6e2ce54c725395cd0f 100644 (file)
--- a/qcsrc/server/mutators/mutator_buffs.qh
+++ b/qcsrc/server/mutators/mutator_buffs.qh
@@ -1,3 +1,6 @@
+#ifndef MUTATOR_BUFFS_H
+#define MUTATOR_BUFFS_H
+
 // buff specific variables \\
 //
 // ammo
@@ -26,3 +29,4 @@ const vector BUFF_MAX = ('16 16 20');
 
 // client side options
 .float cvar_cl_buffs_autoreplace;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/mutator_dodging.qh b/qcsrc/server/mutators/mutator_dodging.qh
index 9840325d97ce8a0ee71ac932242de069a0e3cabf..1d13e45168d333e54a2e7eafa7214922fe64b140 100644 (file)
--- a/qcsrc/server/mutators/mutator_dodging.qh
+++ b/qcsrc/server/mutators/mutator_dodging.qh
@@ -1,3 +1,6 @@
+#ifndef MUTATOR_DODGING_H
+#define MUTATOR_DODGING_H
+
 float g_dodging;
 
 // set to 1 to indicate dodging has started.. reset by physics hook after dodge has been done..
@@ -5,3 +8,4 @@ float g_dodging;
 
 // the jump part of the dodge cannot be ramped
 .float dodging_single_action;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/mutator_nades.qh b/qcsrc/server/mutators/mutator_nades.qh
index c6c30c6d53210dfee9143e12646831e7b727f147..341c4bb59a8ef27e189d7d87d9c23b90b057fb46 100644 (file)
--- a/qcsrc/server/mutators/mutator_nades.qh
+++ b/qcsrc/server/mutators/mutator_nades.qh
@@ -1,3 +1,6 @@
+#ifndef MUTATOR_NADES_H
+#define MUTATOR_NADES_H
+
 .entity nade;
 .entity fake_nade;
 .float nade_timer;
@@ -24,3 +27,4 @@ void(entity player) nades_Clear;
 void(entity player, float score) nades_GiveBonus;
 // Remove all bonus nades from a player
 void(entity player) nades_RemoveBonus;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/mutator_overkill.qh b/qcsrc/server/mutators/mutator_overkill.qh
index 98ba99cb5507c3de5f1fed55eaeb1584beb21456..9e20df33fe77e4b95aeea527bcd39b5a9c8b1340 100644 (file)
--- a/qcsrc/server/mutators/mutator_overkill.qh
+++ b/qcsrc/server/mutators/mutator_overkill.qh
@@ -1,3 +1,6 @@
+#ifndef MUTATOR_OVERKILL_H
+#define MUTATOR_OVERKILL_H
+
 .vector ok_deathloc;
 .float ok_spawnsys_timer;
 .float ok_lastwep;
@@ -12,3 +15,4 @@
 
 void(entity ent, float wep) ok_DecreaseCharge;
 
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/mutators.qh b/qcsrc/server/mutators/mutators.qh
index 4dcc9df2fab87443a85906eddfe402dac5ca7e52..3fa9f7432cd03e8712856897170fd6d168834574 100644 (file)
--- a/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@ -1,3 +1,6 @@
+#ifndef MUTATORS_H
+#define MUTATORS_H
+
 MUTATOR_DECLARATION(gamemode_assault);
 MUTATOR_DECLARATION(gamemode_ca);
 MUTATOR_DECLARATION(gamemode_keyhunt);
@@ -37,3 +40,4 @@ MUTATOR_DECLARATION(mutator_buffs);
 MUTATOR_DECLARATION(sandbox);
 MUTATOR_DECLARATION(mutator_overkill);
 
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mutators/mutators_include.qh b/qcsrc/server/mutators/mutators_include.qh
index df89cfc0d470acf94c3e5e52dd7ed1e570850b79..649fff3e4e299efc5aa134255840b73959bbd96c 100644 (file)
--- a/qcsrc/server/mutators/mutators_include.qh
+++ b/qcsrc/server/mutators/mutators_include.qh
@@ -1,57 +1,6 @@
 #ifndef MUTATORS_INCLUDE_H
 #define MUTATORS_INCLUDE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include "../t_items.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-#endif
-
 #include "base.qh"
 #include "mutators.qh"
 #include "gamemode_assault.qh"

diff --git a/qcsrc/server/pathlib/pathlib.qh b/qcsrc/server/pathlib/pathlib.qh
index 9afbcd55451c3a8ecbff5cca7fc094d05f0e6d41..eb4cee28012eb7c706ef9c3b4e1a774d84b7935d 100644 (file)
--- a/qcsrc/server/pathlib/pathlib.qh
+++ b/qcsrc/server/pathlib/pathlib.qh
@@ -1,89 +1,6 @@
 #ifndef PATHLIB_H
 #define PATHLIB_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include "../t_items.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../mutators/mutators_include.qh"
-    #include "../tturrets/include/turrets_early.qh"
-    #include "../vehicles/vehicles_def.qh"
-    #include "../campaign.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/mapinfo.qh"
-    #include "../command/common.qh"
-    #include "../command/banning.qh"
-    #include "../command/radarmap.qh"
-    #include "../command/vote.qh"
-    #include "../command/getreplies.qh"
-    #include "../command/cmd.qh"
-    #include "../command/sv_cmd.qh"
-    #include "../../common/csqcmodel_settings.qh"
-    #include "../../csqcmodellib/common.qh"
-    #include "../../csqcmodellib/sv_model.qh"
-    #include "../anticheat.qh"
-    #include "../cheats.qh"
-    #include "../../common/playerstats.qh"
-    #include "../portals.qh"
-    #include "../g_hook.qh"
-    #include "../scores.qh"
-    #include "../spawnpoints.qh"
-    #include "../mapvoting.qh"
-    #include "../ipban.qh"
-    #include "../race.qh"
-    #include "../antilag.qh"
-    #include "../playerdemo.qh"
-    #include "../round_handler.qh"
-    #include "../item_key.qh"
-    #include "../secret.qh"
-#endif
-
-
 .entity pathlib_list;
 .entity path_next;
 .entity path_prev;

diff --git a/qcsrc/server/playerdemo.qh b/qcsrc/server/playerdemo.qh
index 7cb28b546e90aa665e60c6cc925a54e1ef34fac5..4fbfdb12f147ca902a1c4e3db797766eaa55e09b 100644 (file)
--- a/qcsrc/server/playerdemo.qh
+++ b/qcsrc/server/playerdemo.qh
@@ -1,84 +1,6 @@
 #ifndef PLAYERDEMO_H
 #define PLAYERDEMO_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-    #include "mapvoting.qh"
-    #include "ipban.qh"
-    #include "race.qh"
-    #include "antilag.qh"
-#endif
-
 void playerdemo_init();
 void playerdemo_shutdown();
 void playerdemo_write();

diff --git a/qcsrc/server/portals.qh b/qcsrc/server/portals.qh
index 124fe1e4d03fc82d82b2297cc4e31a70d8e09a30..846ee25f0a72d4ea183b169ca8ddfc4eb5be4f4e 100644 (file)
--- a/qcsrc/server/portals.qh
+++ b/qcsrc/server/portals.qh
@@ -1,76 +1,6 @@
 #ifndef PORTALS_H
 #define PORTALS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-#endif
-
 .float portal_id;
 .entity portal_in, portal_out;
 

diff --git a/qcsrc/server/race.qh b/qcsrc/server/race.qh
index 4ebbc3ed891425c70773d5c86728a51953761192..58a7e5950b7621733d01438b2e5d0f98352e52a3 100644 (file)
--- a/qcsrc/server/race.qh
+++ b/qcsrc/server/race.qh
@@ -1,82 +1,6 @@
 #ifndef RACE_H
 #define RACE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-    #include "mapvoting.qh"
-    #include "ipban.qh"
-#endif
-
 float race_spawns;
 float race_highest_place_spawn; // number of places; a place higher gets spawned at 0
 float race_lowest_place_spawn; // where to spawn in qualifying

diff --git a/qcsrc/server/round_handler.qh b/qcsrc/server/round_handler.qh
index 95408d39bee9409860ff9bb897c11b4c7e6a20d2..c71b21a68bf86ac3eadc7e0e08857bc32b96c05a 100644 (file)
--- a/qcsrc/server/round_handler.qh
+++ b/qcsrc/server/round_handler.qh
@@ -1,85 +1,6 @@
 #ifndef ROUND_HANDLER_H
 #define ROUND_HANDLER_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-    #include "mapvoting.qh"
-    #include "ipban.qh"
-    #include "race.qh"
-    #include "antilag.qh"
-    #include "playerdemo.qh"
-#endif
-
 entity round_handler;
 .float delay; // stores delay from round end to countdown start
 .float count; // stores initial number of the countdown

diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh
index 01c751d2b835dd334adc3de460d5d636257d5d45..5f9857099b5e3c7aa2bf65c38279e99dee408a76 100644 (file)
--- a/qcsrc/server/scores.qh
+++ b/qcsrc/server/scores.qh
@@ -1,78 +1,6 @@
 #ifndef SCORES_H
 #define SCORES_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-#endif
-
 entity scores_initialized; // non-world when scores labels/rules have been set
 .float scores[MAX_SCORE];
 .float teamscores[MAX_TEAMSCORE];

diff --git a/qcsrc/server/secret.qh b/qcsrc/server/secret.qh
index 8458e579b1dcd7cf3e60617c15c94f33f60feaa5..d1fe4f3be98ef7d0c02e4e0afada63e1aa0aabb4 100644 (file)
--- a/qcsrc/server/secret.qh
+++ b/qcsrc/server/secret.qh
@@ -1,87 +1,6 @@
 #ifndef SECRET_H
 #define SECRET_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-    #include "scores.qh"
-    #include "spawnpoints.qh"
-    #include "mapvoting.qh"
-    #include "ipban.qh"
-    #include "race.qh"
-    #include "antilag.qh"
-    #include "playerdemo.qh"
-    #include "round_handler.qh"
-    #include "item_key.qh"
-#endif
-
 /**
  * Total number of secrets on the map.
  */

diff --git a/qcsrc/server/spawnpoints.qh b/qcsrc/server/spawnpoints.qh
index e9a3bb993509d017a9cbd88c11a0ed32e4cffd5e..6f180128ef6bad896cfeda2cdcce537dd0d158fc 100644 (file)
--- a/qcsrc/server/spawnpoints.qh
+++ b/qcsrc/server/spawnpoints.qh
@@ -1,79 +1,6 @@
 #ifndef SPAWNPOINTS_H
 #define SPAWNPOINTS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "campaign.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/mapinfo.qh"
-    #include "command/common.qh"
-    #include "command/banning.qh"
-    #include "command/radarmap.qh"
-    #include "command/vote.qh"
-    #include "command/getreplies.qh"
-    #include "command/cmd.qh"
-    #include "command/sv_cmd.qh"
-    #include "../common/csqcmodel_settings.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/sv_model.qh"
-    #include "anticheat.qh"
-    #include "cheats.qh"
-    #include "../common/playerstats.qh"
-    #include "portals.qh"
-    #include "g_hook.qh"
-    #include "scores.qh"
-#endif
-
 .vector spawnpoint_score;
 float spawnpoint_nag;
 float SpawnEvent_Send(entity to, float sf);

diff --git a/qcsrc/server/sys-post.qh b/qcsrc/server/sys-post.qh
index 06b32042b82b8700248bb6842778db83f014d47f..d66da5a0e53497f6a5048ce173e6ea7ed12c3b00 100644 (file)
--- a/qcsrc/server/sys-post.qh
+++ b/qcsrc/server/sys-post.qh
@@ -1,15 +1,6 @@
 #ifndef SERVER_SYS_POST_H
 #define SERVER_SYS_POST_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-#endif
-
 #pragma noref 0
 
 #undef ATTEN_NORM

diff --git a/qcsrc/server/sys-pre.qh b/qcsrc/server/sys-pre.qh
index 07c5209389232ee7e78ab1f74236efbd07eca590..8e5bd337525ad7b90a204c56578c73f31338a6fe 100644 (file)
--- a/qcsrc/server/sys-pre.qh
+++ b/qcsrc/server/sys-pre.qh
@@ -1,12 +1,6 @@
 #ifndef SERVER_SYS_PRE_H
 #define SERVER_SYS_PRE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-#endif
-
 #define ATTEN_NORM builtin_ATTEN_NORM
 #define objerror builtin_objerror
 #define droptofloor builtin_droptofloor

diff --git a/qcsrc/server/t_items.qh b/qcsrc/server/t_items.qh
index c31f226f6cd57e7d52eba91bc32f28a25d9487bc..f722214074689c53db301bdc44a28d3e2dc8ccaf 100644 (file)
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -1,103 +1,6 @@
 #ifndef T_ITEMS_H
 #define T_ITEMS_H
 
-#if defined(CSQC)
-       #include "../common/util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../client/sys-post.qh"
-       #include "../client/defs.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "../common/constants.qh"
-       #include "../common/stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "../common/playerstats.qh"
-       #include "../common/teams.qh"
-       #include "../common/util.qh"
-       #include "../common/nades.qh"
-       #include "../common/buffs.qh"
-       #include "../common/test.qh"
-       #include "../common/counting.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "../common/mapinfo.qh"
-       #include "../common/command/markup.qh"
-       #include "../common/command/rpn.qh"
-       #include "../common/command/generic.qh"
-       #include "../common/command/shared_defs.qh"
-       #include "../common/urllib.qh"
-       #include "../common/animdecide.qh"
-       #include "../client/command/cl_cmd.qh"
-       #include "../common/monsters/monsters.qh"
-       #include "../client/autocvars.qh"
-       #include "../common/notifications.qh"
-       #include "../common/deathtypes.qh"
-       #include "../client/damage.qh"
-       #include "../csqcmodellib/interpolate.qh"
-       #include "../client/teamradar.qh"
-       #include "../client/hud.qh"
-       #include "../client/scoreboard.qh"
-       #include "../client/waypointsprites.qh"
-       #include "../client/movetypes.qh"
-       #include "../client/prandom.qh"
-       #include "../client/bgmscript.qh"
-       #include "../client/noise.qh"
-       #include "../client/tturrets.qh"
-       #include "tturrets/include/turrets_early.qh"
-       #include "../client/main.qh"
-       #include "../client/vehicles/vehicles.qh"
-       #include "../common/csqcmodel_settings.qh"
-       #include "../csqcmodellib/common.qh"
-       #include "../csqcmodellib/cl_model.qh"
-       #include "../csqcmodellib/cl_player.qh"
-       #include "../client/weapons/projectile.qh"
-       #include "../client/player_skeleton.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/urllib.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/net_notice.qh"
-    #include "../common/animdecide.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/monsters/sv_monsters.qh"
-    #include "../common/monsters/spawn.qh"
-    #include "../common/weapons/config.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/accuracy.qh"
-    #include "weapons/common.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "weapons/hitplot.qh"
-    #include "weapons/selection.qh"
-    #include "weapons/spawning.qh"
-    #include "weapons/throwing.qh"
-    #include "weapons/tracing.qh"
-    #include "weapons/weaponstats.qh"
-    #include "weapons/weaponsystem.qh"
-#endif
-
 // constants
 const int IT_UNLIMITED_WEAPON_AMMO             =       1; // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup.
 const int IT_UNLIMITED_SUPERWEAPONS            =       2; // when this bit is set, superweapons don't expire. Checkpoints can give this powerup.

diff --git a/qcsrc/server/tturrets/include/turrets.qh b/qcsrc/server/tturrets/include/turrets.qh
index f3288a52ccbc03fdbac75c657bea1b443db48249..b9c3501d4905eddcfd0c2ece35bf89d04b5bc863 100644 (file)
--- a/qcsrc/server/tturrets/include/turrets.qh
+++ b/qcsrc/server/tturrets/include/turrets.qh
@@ -1,89 +1,6 @@
 #ifndef TURRETS_H
 #define TURRETS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../../common/util-pre.qh"
-    #include "../../sys-pre.qh"
-    #include "../../../dpdefs/progsdefs.qh"
-    #include "../../../dpdefs/dpextensions.qh"
-    #include "../../sys-post.qh"
-    #include "../../../warpzonelib/anglestransform.qh"
-    #include "../../../warpzonelib/mathlib.qh"
-    #include "../../../warpzonelib/common.qh"
-    #include "../../../warpzonelib/util_server.qh"
-    #include "../../../warpzonelib/server.qh"
-    #include "../../../common/constants.qh"
-    #include "../../../common/stats.qh"
-    #include "../../../common/teams.qh"
-    #include "../../../common/util.qh"
-    #include "../../../common/nades.qh"
-    #include "../../../common/buffs.qh"
-    #include "../../../common/test.qh"
-    #include "../../../common/counting.qh"
-    #include "../../../common/urllib.qh"
-    #include "../../../common/command/markup.qh"
-    #include "../../../common/command/rpn.qh"
-    #include "../../../common/command/generic.qh"
-    #include "../../../common/command/shared_defs.qh"
-    #include "../../../common/net_notice.qh"
-    #include "../../../common/animdecide.qh"
-    #include "../../../common/monsters/monsters.qh"
-    #include "../../../common/monsters/sv_monsters.qh"
-    #include "../../../common/monsters/spawn.qh"
-    #include "../../../common/weapons/config.qh"
-    #include "../../../common/weapons/weapons.qh"
-    #include "../../weapons/accuracy.qh"
-    #include "../../weapons/common.qh"
-    #include "../../weapons/csqcprojectile.qh"
-    #include "../../weapons/hitplot.qh"
-    #include "../../weapons/selection.qh"
-    #include "../../weapons/spawning.qh"
-    #include "../../weapons/throwing.qh"
-    #include "../../weapons/tracing.qh"
-    #include "../../weapons/weaponstats.qh"
-    #include "../../weapons/weaponsystem.qh"
-    #include "../../t_items.qh"
-    #include "../../autocvars.qh"
-    #include "../../constants.qh"
-    #include "../../defs.qh"
-    #include "../../../common/notifications.qh"
-    #include "../../../common/deathtypes.qh"
-    #include "../../mutators/mutators_include.qh"
-    #include "turrets_early.qh"
-    #include "../../vehicles/vehicles_def.qh"
-    #include "../../campaign.qh"
-    #include "../../../common/campaign_common.qh"
-    #include "../../../common/mapinfo.qh"
-    #include "../../command/common.qh"
-    #include "../../command/banning.qh"
-    #include "../../command/radarmap.qh"
-    #include "../../command/vote.qh"
-    #include "../../command/getreplies.qh"
-    #include "../../command/cmd.qh"
-    #include "../../command/sv_cmd.qh"
-    #include "../../../common/csqcmodel_settings.qh"
-    #include "../../../csqcmodellib/common.qh"
-    #include "../../../csqcmodellib/sv_model.qh"
-    #include "../../anticheat.qh"
-    #include "../../cheats.qh"
-    #include "../../../common/playerstats.qh"
-    #include "../../portals.qh"
-    #include "../../g_hook.qh"
-    #include "../../scores.qh"
-    #include "../../spawnpoints.qh"
-    #include "../../mapvoting.qh"
-    #include "../../ipban.qh"
-    #include "../../race.qh"
-    #include "../../antilag.qh"
-    #include "../../playerdemo.qh"
-    #include "../../round_handler.qh"
-    #include "../../item_key.qh"
-    #include "../../secret.qh"
-#endif
-
-
 #ifdef TTURRETS_ENABLED
 
 // Include section.

diff --git a/qcsrc/server/tturrets/include/turrets_early.qh b/qcsrc/server/tturrets/include/turrets_early.qh
index 5d6d33dce06ee58be131e7a0a3283711e504e1bf..181d4416636c832220a8133cf43a40e6fd09591a 100644 (file)
--- a/qcsrc/server/tturrets/include/turrets_early.qh
+++ b/qcsrc/server/tturrets/include/turrets_early.qh
@@ -1,101 +1,6 @@
 #ifndef TURRETS_EARLY_H
 #define TURRETS_EARLY_H
 
-#if defined(CSQC)
-    #include "../../../common/util-pre.qh"
-    #include "../../../client/sys-pre.qh"
-    #include "../../../dpdefs/csprogsdefs.qh"
-    #include "../../../client/sys-post.qh"
-    #include "../../../client/defs.qh"
-    #include "../../../dpdefs/keycodes.qh"
-    #include "../../../common/constants.qh"
-    #include "../../../common/stats.qh"
-    #include "../../../warpzonelib/anglestransform.qh"
-    #include "../../../warpzonelib/mathlib.qh"
-    #include "../../../warpzonelib/common.qh"
-    #include "../../../warpzonelib/client.qh"
-    #include "../../../common/playerstats.qh"
-    #include "../../../common/teams.qh"
-    #include "../../../common/util.qh"
-    #include "../../../common/nades.qh"
-    #include "../../../common/buffs.qh"
-    #include "../../../common/test.qh"
-    #include "../../../common/counting.qh"
-    #include "../../../common/weapons/weapons.qh"
-    #include "../../../common/mapinfo.qh"
-    #include "../../../common/command/markup.qh"
-    #include "../../../common/command/rpn.qh"
-    #include "../../../common/command/generic.qh"
-    #include "../../../common/command/shared_defs.qh"
-    #include "../../../common/urllib.qh"
-    #include "../../../common/animdecide.qh"
-    #include "../../../client/command/cl_cmd.qh"
-    #include "../../../common/monsters/monsters.qh"
-    #include "../../../client/autocvars.qh"
-    #include "../../../common/notifications.qh"
-    #include "../../../common/deathtypes.qh"
-    #include "../../../client/damage.qh"
-    #include "../../../csqcmodellib/interpolate.qh"
-    #include "../../../client/teamradar.qh"
-    #include "../../../client/hud.qh"
-    #include "../../../client/scoreboard.qh"
-    #include "../../../client/waypointsprites.qh"
-    #include "../../../client/movetypes.qh"
-    #include "../../../client/prandom.qh"
-    #include "../../../client/bgmscript.qh"
-    #include "../../../client/noise.qh"
-    #include "../../../client/tturrets.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../../common/util-pre.qh"
-    #include "../../sys-pre.qh"
-    #include "../../../dpdefs/progsdefs.qh"
-    #include "../../../dpdefs/dpextensions.qh"
-    #include "../../sys-post.qh"
-    #include "../../../warpzonelib/anglestransform.qh"
-    #include "../../../warpzonelib/mathlib.qh"
-    #include "../../../warpzonelib/common.qh"
-    #include "../../../warpzonelib/util_server.qh"
-    #include "../../../warpzonelib/server.qh"
-    #include "../../../common/constants.qh"
-    #include "../../../common/stats.qh"
-    #include "../../../common/teams.qh"
-    #include "../../../common/util.qh"
-    #include "../../../common/nades.qh"
-    #include "../../../common/buffs.qh"
-    #include "../../../common/test.qh"
-    #include "../../../common/counting.qh"
-    #include "../../../common/urllib.qh"
-    #include "../../../common/command/markup.qh"
-    #include "../../../common/command/rpn.qh"
-    #include "../../../common/command/generic.qh"
-    #include "../../../common/command/shared_defs.qh"
-    #include "../../../common/net_notice.qh"
-    #include "../../../common/animdecide.qh"
-    #include "../../../common/monsters/monsters.qh"
-    #include "../../../common/monsters/sv_monsters.qh"
-    #include "../../../common/monsters/spawn.qh"
-    #include "../../../common/weapons/config.qh"
-    #include "../../../common/weapons/weapons.qh"
-    #include "../../weapons/accuracy.qh"
-    #include "../../weapons/common.qh"
-    #include "../../weapons/csqcprojectile.qh"
-    #include "../../weapons/hitplot.qh"
-    #include "../../weapons/selection.qh"
-    #include "../../weapons/spawning.qh"
-    #include "../../weapons/throwing.qh"
-    #include "../../weapons/tracing.qh"
-    #include "../../weapons/weaponstats.qh"
-    #include "../../weapons/weaponsystem.qh"
-    #include "../../t_items.qh"
-    #include "../../autocvars.qh"
-    #include "../../constants.qh"
-    #include "../../defs.qh"
-    #include "../../../common/notifications.qh"
-    #include "../../../common/deathtypes.qh"
-    #include "../../mutators/mutators_include.qh"
-#endif
-
 // Comment out below to skip turrets
 #define TTURRETS_ENABLED
 

diff --git a/qcsrc/server/vehicles/vehicles.qh b/qcsrc/server/vehicles/vehicles.qh
index 2ecb8e1f81c4b50e4a6e0e21ad1e9834137632d7..5c64d6b9f1943bedd70cc33391588b1dcb130a4a 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qh
+++ b/qcsrc/server/vehicles/vehicles.qh
@@ -1,90 +1,6 @@
 #ifndef VEHICLES_H
 #define VEHICLES_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include "../t_items.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../mutators/mutators_include.qh"
-    #include "../tturrets/include/turrets_early.qh"
-    #include "vehicles_def.qh"
-    #include "../campaign.qh"
-    #include "../../common/campaign_common.qh"
-    #include "../../common/mapinfo.qh"
-    #include "../command/common.qh"
-    #include "../command/banning.qh"
-    #include "../command/radarmap.qh"
-    #include "../command/vote.qh"
-    #include "../command/getreplies.qh"
-    #include "../command/cmd.qh"
-    #include "../command/sv_cmd.qh"
-    #include "../../common/csqcmodel_settings.qh"
-    #include "../../csqcmodellib/common.qh"
-    #include "../../csqcmodellib/sv_model.qh"
-    #include "../anticheat.qh"
-    #include "../cheats.qh"
-    #include "../../common/playerstats.qh"
-    #include "../portals.qh"
-    #include "../g_hook.qh"
-    #include "../scores.qh"
-    #include "../spawnpoints.qh"
-    #include "../mapvoting.qh"
-    #include "../ipban.qh"
-    #include "../race.qh"
-    #include "../antilag.qh"
-    #include "../playerdemo.qh"
-    #include "../round_handler.qh"
-    #include "../item_key.qh"
-    #include "../secret.qh"
-    #include "../pathlib/pathlib.qh"
-    #include "../tturrets/include/turrets.qh"
-#endif
-
 #ifdef VEHICLES_ENABLED
 #include "vehicles.qc"
 

diff --git a/qcsrc/server/vehicles/vehicles_def.qh b/qcsrc/server/vehicles/vehicles_def.qh
index cd1abb8c5910865708f1be7cfc5a2c494bbf9693..8a76ecc3cc8bc1a94a195fee67106e6f0b2a5da2 100644 (file)
--- a/qcsrc/server/vehicles/vehicles_def.qh
+++ b/qcsrc/server/vehicles/vehicles_def.qh
@@ -1,59 +1,6 @@
 #ifndef VEHICLES_DEF_H
 #define VEHICLES_DEF_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include "../t_items.qh"
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include "../../common/notifications.qh"
-    #include "../../common/deathtypes.qh"
-    #include "../mutators/mutators_include.qh"
-    #include "../tturrets/include/turrets_early.qh"
-#endif
-
 // #define VEHICLES_USE_ODE
 #define VEHICLES_ENABLED
 #ifdef VEHICLES_ENABLED

diff --git a/qcsrc/server/weapons/accuracy.qh b/qcsrc/server/weapons/accuracy.qh
index 4b85a82ecf3adb1741e340a52b0334b47d5a83f7..37b76ee0cb295249a9933fa250853dcf4a90e433 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qh
+++ b/qcsrc/server/weapons/accuracy.qh
@@ -1,41 +1,6 @@
 #ifndef ACCURACY_H
 #define ACCURACY_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-#endif
-
 .float cvar_cl_accuracy_data_share;
 .float cvar_cl_accuracy_data_receive;
 

diff --git a/qcsrc/server/weapons/common.qh b/qcsrc/server/weapons/common.qh
index 6941b015709d09704b6dadab56202eedb4ac8a97..6618367ed2369acef19e40131b0c065ae4b57ef6 100644 (file)
--- a/qcsrc/server/weapons/common.qh
+++ b/qcsrc/server/weapons/common.qh
@@ -1,42 +1,6 @@
 #ifndef WEAPONS_COMMON_H
 #define WEAPONS_COMMON_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-#endif
-
 void W_GiveWeapon (entity e, float wep);
 .float prevstrengthsound;
 .float prevstrengthsoundattempt;

diff --git a/qcsrc/server/weapons/csqcprojectile.qh b/qcsrc/server/weapons/csqcprojectile.qh
index bc52f41bc4c5dac50563a1ca6ffa03c45ad20e39..7f4bd463221537d8591050ffa9f370b9669dd919 100644 (file)
--- a/qcsrc/server/weapons/csqcprojectile.qh
+++ b/qcsrc/server/weapons/csqcprojectile.qh
@@ -1,43 +1,6 @@
 #ifndef CSQCPROJECTILE_H
 #define CSQCPROJECTILE_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-    #include "common.qh"
-#endif
-
 .float csqcprojectile_clientanimate;
 
 void CSQCProjectile(entity e, float clientanimate, float type, float docull);

diff --git a/qcsrc/server/weapons/hitplot.qh b/qcsrc/server/weapons/hitplot.qh
index 850d88aab910317f3be7166624edfd4bac1fdde6..2c37622f844677973ca400cb416147e06cae1ea0 100644 (file)
--- a/qcsrc/server/weapons/hitplot.qh
+++ b/qcsrc/server/weapons/hitplot.qh
@@ -1,44 +1,6 @@
 #ifndef HITPLOT_H
 #define HITPLOT_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-    #include "common.qh"
-    #include "csqcprojectile.qh"
-#endif
-
 .float hitplotfh;
 
 void W_HitPlotAnalysis(entity player, vector screenforward, vector screenright, vector screenup);

diff --git a/qcsrc/server/weapons/selection.qh b/qcsrc/server/weapons/selection.qh
index c2243e78b77d79695c5e9018d3461c789d8d2215..21ca14d95f850c7ecaeba3c462e53d1582eb5f6e 100644 (file)
--- a/qcsrc/server/weapons/selection.qh
+++ b/qcsrc/server/weapons/selection.qh
@@ -1,45 +1,6 @@
 #ifndef SELECTION_H
 #define SELECTION_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-    #include "common.qh"
-    #include "csqcprojectile.qh"
-    #include "hitplot.qh"
-#endif
-
 // switch between weapons
 void Send_WeaponComplain(entity e, float wpn, float type);
 

diff --git a/qcsrc/server/weapons/spawning.qh b/qcsrc/server/weapons/spawning.qh
index cc557c716626567177c8c440bae4da57845d0d52..2e3efb62b3214af310abaa8f92005c7019a2f116 100644 (file)
--- a/qcsrc/server/weapons/spawning.qh
+++ b/qcsrc/server/weapons/spawning.qh
@@ -1,46 +1,6 @@
 #ifndef SPAWNING_H
 #define SPAWNING_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-    #include "common.qh"
-    #include "csqcprojectile.qh"
-    #include "hitplot.qh"
-    #include "selection.qh"
-#endif
-
 string W_Apply_Weaponreplace(string in);
 
 void weapon_defaultspawnfunc(float wpn);

diff --git a/qcsrc/server/weapons/throwing.qh b/qcsrc/server/weapons/throwing.qh
index ccb4d5a67f235f1634b6f8a26ef82cbcb4a4aa9c..b1d4cbb00b24fe1f75499d410713152b73924067 100644 (file)
--- a/qcsrc/server/weapons/throwing.qh
+++ b/qcsrc/server/weapons/throwing.qh
@@ -1,47 +1,6 @@
 #ifndef THROWING_H
 #define THROWING_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-    #include "common.qh"
-    #include "csqcprojectile.qh"
-    #include "hitplot.qh"
-    #include "selection.qh"
-    #include "spawning.qh"
-#endif
-
 .float savenextthink;
 void thrown_wep_think();
 

diff --git a/qcsrc/server/weapons/tracing.qh b/qcsrc/server/weapons/tracing.qh
index 2015bf6c0841f3a698893c42ed525c66098cf5c9..74662d19585265d1f296f78d0e7e099e38828bdb 100644 (file)
--- a/qcsrc/server/weapons/tracing.qh
+++ b/qcsrc/server/weapons/tracing.qh
@@ -1,48 +1,6 @@
 #ifndef TRACING_H
 #define TRACING_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-    #include "common.qh"
-    #include "csqcprojectile.qh"
-    #include "hitplot.qh"
-    #include "selection.qh"
-    #include "spawning.qh"
-    #include "throwing.qh"
-#endif
-
 vector w_shotorg;
 vector w_shotdir;
 vector w_shotend;

diff --git a/qcsrc/server/weapons/weaponstats.qh b/qcsrc/server/weapons/weaponstats.qh
index dbac4f10ced0b31c055934b494f7b1f3e0716fa8..29c4ef98fa0734e5bd9233027c74bc0487043cc7 100644 (file)
--- a/qcsrc/server/weapons/weaponstats.qh
+++ b/qcsrc/server/weapons/weaponstats.qh
@@ -1,49 +1,6 @@
 #ifndef WEAPONSTATS_H
 #define WEAPONSTATS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-    #include "common.qh"
-    #include "csqcprojectile.qh"
-    #include "hitplot.qh"
-    #include "selection.qh"
-    #include "spawning.qh"
-    #include "throwing.qh"
-    #include "tracing.qh"
-#endif
-
 float weaponstats_buffer;
 
 void WeaponStats_Init();

diff --git a/qcsrc/server/weapons/weaponsystem.qh b/qcsrc/server/weapons/weaponsystem.qh
index 9eb387792d4af2612206f4f86ac125e67bd71b93..47bcadea4dea7aef84364d6e526e1ac9fddc1c68 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qh
+++ b/qcsrc/server/weapons/weaponsystem.qh
@@ -1,50 +1,6 @@
 #ifndef WEAPONSYSTEM_H
 #define WEAPONSYSTEM_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-    #include "common.qh"
-    #include "csqcprojectile.qh"
-    #include "hitplot.qh"
-    #include "selection.qh"
-    #include "spawning.qh"
-    #include "throwing.qh"
-    #include "tracing.qh"
-    #include "weaponstats.qh"
-#endif
-
 float weaponswapping;
 float internalteam;
 

diff --git a/qcsrc/warpzonelib/anglestransform.qh b/qcsrc/warpzonelib/anglestransform.qh
index c95384498b265ae4d7c949638fef2988d1436ec2..e65430230b0d0b7d1ffd7872128431f621806f9c 100644 (file)
--- a/qcsrc/warpzonelib/anglestransform.qh
+++ b/qcsrc/warpzonelib/anglestransform.qh
@@ -1,24 +1,6 @@
 #ifndef ANGLETRANSFORM_H
 #define ANGLETRANSFORM_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-#endif
-
 #define POSITIVE_PITCH_IS_DOWN
 
 #ifdef POSITIVE_PITCH_IS_DOWN

diff --git a/qcsrc/warpzonelib/client.qh b/qcsrc/warpzonelib/client.qh
index 7a9c83254d970f6dda6fb917597792359504b0d0..4b6aac4abe18f34ba2a93fad8a7d32234fed4968 100644 (file)
--- a/qcsrc/warpzonelib/client.qh
+++ b/qcsrc/warpzonelib/client.qh
@@ -1,22 +1,6 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "anglestransform.qh"
-    #include "mathlib.qh"
-    #include "common.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 void WarpZone_Read(float bIsNewEntity);
 void WarpZone_Camera_Read(float bIsNewEntity);
 void WarpZone_Teleported_Read(float bIsNewEntity);

diff --git a/qcsrc/warpzonelib/common.qh b/qcsrc/warpzonelib/common.qh
index 6062d26d6fb209af8dde9468aae5c0802117b55f..892d326bf7cc233b6dcc7d09e9994aac7457eff1 100644 (file)
--- a/qcsrc/warpzonelib/common.qh
+++ b/qcsrc/warpzonelib/common.qh
@@ -1,28 +1,6 @@
 #ifndef WARPZONELIB_COMMON_H
 #define WARPZONELIB_COMMON_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "anglestransform.qh"
-    #include "mathlib.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "anglestransform.qh"
-    #include "mathlib.qh"
-#endif
-
 // uncomment this if your mod uses the roll angle in fixangle
 // #define KEEP_ROLL
 

diff --git a/qcsrc/warpzonelib/mathlib.qh b/qcsrc/warpzonelib/mathlib.qh
index b5b3f0e208212281384be89b782925a9d560e4da..6d1e488dc8f121b81d15652c22a1dd4481d2984d 100644 (file)
--- a/qcsrc/warpzonelib/mathlib.qh
+++ b/qcsrc/warpzonelib/mathlib.qh
@@ -1,32 +1,6 @@
 #ifndef MATHLIB_H
 #define MATHLIB_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "../client/sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../client/sys-post.qh"
-    #include "../client/defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "anglestransform.qh"
-#elif defined(MENUQC)
-    #include "../common/util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "anglestransform.qh"
-#endif
-
 // <math.h>
 
 // The commented-out functions need no implementation because DarkPlaces offers

diff --git a/qcsrc/warpzonelib/server.qh b/qcsrc/warpzonelib/server.qh
index c91f37290c744cb2ebf1f11bcf7697a4475f4c7f..359a29a1fbc852a6af5f19cff0ca613b6bb2916d 100644 (file)
--- a/qcsrc/warpzonelib/server.qh
+++ b/qcsrc/warpzonelib/server.qh
@@ -1,20 +1,6 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "anglestransform.qh"
-    #include "mathlib.qh"
-    #include "common.qh"
-    #include "util_server.qh"
-#endif
-
 void WarpZone_StartFrame();
 float WarpZone_Projectile_Touch();
 

diff --git a/qcsrc/warpzonelib/util_server.qh b/qcsrc/warpzonelib/util_server.qh
index 64002cf96d5eeb89d8eaf9cad33962a00aaf6454..e6f1071e73c54ded8c044e141aa0ae62f617a916 100644 (file)
--- a/qcsrc/warpzonelib/util_server.qh
+++ b/qcsrc/warpzonelib/util_server.qh
@@ -1,19 +1,6 @@
 #ifndef UTIL_SERVER_H
 #define UTIL_SERVER_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../common/util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "anglestransform.qh"
-    #include "mathlib.qh"
-    #include "common.qh"
-#endif
-
 float WarpZoneLib_MoveOutOfSolid(entity e);
 float WarpZoneLib_ExactTrigger_Touch();
 void WarpZoneLib_ExactTrigger_Init();