Remove includes from most headers
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Jan 2015 00:50:34 +0000 (11:50 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Jan 2015 00:50:34 +0000 (11:50 +1100)
141 files changed:
qcsrc/client/autocvars.qh
qcsrc/client/bgmscript.qh
qcsrc/client/command/cl_cmd.qh
qcsrc/client/damage.qh
qcsrc/client/defs.qh
qcsrc/client/hud.qh
qcsrc/client/main.qh
qcsrc/client/movetypes.qh
qcsrc/client/noise.qh
qcsrc/client/player_skeleton.qh
qcsrc/client/prandom.qh
qcsrc/client/scoreboard.qh
qcsrc/client/shownames.qh
qcsrc/client/sys-post.qh
qcsrc/client/sys-pre.qh
qcsrc/client/teamradar.qh
qcsrc/client/tturrets.qh
qcsrc/client/vehicles/vehicles.qh
qcsrc/client/waypointsprites.qh
qcsrc/client/weapons/projectile.qh
qcsrc/common/animdecide.qh
qcsrc/common/buffs.qh
qcsrc/common/campaign_common.qh
qcsrc/common/command/generic.qh
qcsrc/common/command/markup.qh
qcsrc/common/command/rpn.qh
qcsrc/common/command/shared_defs.qh
qcsrc/common/constants.qh
qcsrc/common/counting.qh
qcsrc/common/csqcmodel_settings.qh
qcsrc/common/deathtypes.qh
qcsrc/common/mapinfo.qh
qcsrc/common/monsters/all.qh
qcsrc/common/monsters/monsters.qh
qcsrc/common/monsters/spawn.qh
qcsrc/common/monsters/sv_monsters.qh
qcsrc/common/nades.qh
qcsrc/common/net_notice.qh
qcsrc/common/notifications.qh
qcsrc/common/playerstats.qh
qcsrc/common/stats.qh
qcsrc/common/teams.qh
qcsrc/common/test.qh
qcsrc/common/urllib.qh
qcsrc/common/util-pre.qh
qcsrc/common/util.qh
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/calculations.qh
qcsrc/common/weapons/config.qh
qcsrc/common/weapons/weapons.qh
qcsrc/csqcmodellib/cl_model.qh
qcsrc/csqcmodellib/cl_player.qh
qcsrc/csqcmodellib/common.qh
qcsrc/csqcmodellib/interpolate.qh
qcsrc/csqcmodellib/settings.qh
qcsrc/csqcmodellib/sv_model.qh
qcsrc/dpdefs/keycodes.qh
qcsrc/dpdefs/menudefs.qh
qcsrc/menu/command/menu_cmd.qh
qcsrc/menu/config.qh
qcsrc/menu/draw.qh
qcsrc/menu/menu.qh
qcsrc/menu/oo/base.qh
qcsrc/menu/oo/implementation.qh
qcsrc/menu/oo/interface.qh
qcsrc/menu/skin.qh
qcsrc/menu/sys-post.qh
qcsrc/menu/sys-pre.qh
qcsrc/menu/xonotic/util.qh
qcsrc/server/anticheat.qh
qcsrc/server/antilag.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/aim.qh
qcsrc/server/bot/bot.qh
qcsrc/server/bot/havocbot/havocbot.qh
qcsrc/server/bot/navigation.qh
qcsrc/server/bot/waypoints.qh
qcsrc/server/campaign.qh
qcsrc/server/cheats.qh
qcsrc/server/command/banning.qh
qcsrc/server/command/cmd.qh
qcsrc/server/command/common.qh
qcsrc/server/command/getreplies.qh
qcsrc/server/command/radarmap.qh
qcsrc/server/command/sv_cmd.qh
qcsrc/server/command/vote.qh
qcsrc/server/constants.qh
qcsrc/server/defs.qh
qcsrc/server/g_hook.qh
qcsrc/server/ipban.qh
qcsrc/server/item_key.qh
qcsrc/server/mapvoting.qh
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_assault.qh
qcsrc/server/mutators/gamemode_ca.qh
qcsrc/server/mutators/gamemode_ctf.qh
qcsrc/server/mutators/gamemode_cts.qh
qcsrc/server/mutators/gamemode_domination.qh
qcsrc/server/mutators/gamemode_invasion.qh
qcsrc/server/mutators/gamemode_keepaway.qh
qcsrc/server/mutators/gamemode_keyhunt.qh
qcsrc/server/mutators/gamemode_lms.qh
qcsrc/server/mutators/gamemode_nexball.qh
qcsrc/server/mutators/gamemode_race.qh
qcsrc/server/mutators/mutator_buffs.qh
qcsrc/server/mutators/mutator_dodging.qh
qcsrc/server/mutators/mutator_nades.qh
qcsrc/server/mutators/mutator_overkill.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/mutators/mutators_include.qh
qcsrc/server/pathlib/pathlib.qh
qcsrc/server/playerdemo.qh
qcsrc/server/portals.qh
qcsrc/server/race.qh
qcsrc/server/round_handler.qh
qcsrc/server/scores.qh
qcsrc/server/secret.qh
qcsrc/server/spawnpoints.qh
qcsrc/server/sys-post.qh
qcsrc/server/sys-pre.qh
qcsrc/server/t_items.qh
qcsrc/server/tturrets/include/turrets.qh
qcsrc/server/tturrets/include/turrets_early.qh
qcsrc/server/vehicles/vehicles.qh
qcsrc/server/vehicles/vehicles_def.qh
qcsrc/server/weapons/accuracy.qh
qcsrc/server/weapons/common.qh
qcsrc/server/weapons/csqcprojectile.qh
qcsrc/server/weapons/hitplot.qh
qcsrc/server/weapons/selection.qh
qcsrc/server/weapons/spawning.qh
qcsrc/server/weapons/throwing.qh
qcsrc/server/weapons/tracing.qh
qcsrc/server/weapons/weaponstats.qh
qcsrc/server/weapons/weaponsystem.qh
qcsrc/warpzonelib/anglestransform.qh
qcsrc/warpzonelib/client.qh
qcsrc/warpzonelib/common.qh
qcsrc/warpzonelib/mathlib.qh
qcsrc/warpzonelib/server.qh
qcsrc/warpzonelib/util_server.qh

index c526c0b..4ce4efe 100644 (file)
@@ -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;
index 8e2c76d..1590e59 100644 (file)
@@ -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;
index 3a3abe7..31da5a2 100644 (file)
@@ -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();
 
index a18a2d0..2498e23 100644 (file)
@@ -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
index 2a66024..b13583f 100644 (file)
@@ -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.
index ec9ccc1..5c21886 100644 (file)
@@ -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;
index f407875..3b36a12 100644 (file)
@@ -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
 
index 3c1f521..5625c23 100644 (file)
@@ -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;
index 7761c4c..d0196be 100644 (file)
@@ -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);
index 508041d..65dec0a 100644 (file)
@@ -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);
index 5af1ef6..3ba1c47 100644 (file)
@@ -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
index 7754ca5..388e254 100644 (file)
@@ -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;
index 0f6a674..4074f7a 100644 (file)
@@ -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;
index 611ea72..c2b43cd 100644 (file)
@@ -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
index f6202b5..c8e8c9d 100644 (file)
@@ -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
index b03d5cc..3585b73 100644 (file)
@@ -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
index cf3a3f5..b6184dc 100644 (file)
@@ -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;
index 1cd9100..fa4875b 100644 (file)
@@ -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();
index ff8d61d..9a066a4 100644 (file)
@@ -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();
index 2f9d035..a48ff1a 100644 (file)
@@ -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);
index 06ad9c7..c483479 100644 (file)
@@ -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);
 
index c789981..e2dcbae 100644 (file)
@@ -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
index d105fd5..01dbeb9 100644 (file)
@@ -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
index 7b4b82f..d1faa25 100644 (file)
@@ -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
index 2702936..918d3d3 100644 (file)
@@ -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
index 6d9bf9f..e811a78 100644 (file)
@@ -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
index a3cbaca..e7edd35 100644 (file)
@@ -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
index 886b720..9e33205 100644 (file)
@@ -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;
index c5c9567..77149f2 100644 (file)
@@ -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
 // ===============================================
index 04a7a7d..1ad245c 100644 (file)
@@ -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
 
index 97d2b02..ddc7b14 100644 (file)
@@ -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
 // ================================
index 960cdb3..943e81f 100644 (file)
@@ -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;
index d30f298..fec3f63 100644 (file)
@@ -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
index 1ef0e4a..c21b237 100644 (file)
@@ -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
index 732d634..eff2754 100644 (file)
@@ -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
index 28dc8a8..0ca54e5 100644 (file)
@@ -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;
 
index 0f24ac6..60338c3 100644 (file)
@@ -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;
index ac6a5ea..958b89a 100644 (file)
@@ -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);
index 5789201..4bd5192 100644 (file)
@@ -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
index b8b2385..50a1409 100644 (file)
@@ -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
index e56331a..a55b946 100644 (file)
@@ -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
 
index 5633ae5..67fc37a 100644 (file)
@@ -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
index fc26ccb..4ada66e 100644 (file)
@@ -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();
index 1946e3b..8bc9e83 100644 (file)
@@ -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;
index d8bd863..b0327b4 100644 (file)
@@ -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
index 13c27c0..5656c96 100644 (file)
@@ -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(); }
index 4f4cd2b..834f962 100644 (file)
@@ -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
index 9a6dd1c..71cdc21 100644 (file)
@@ -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
index 77edc19..bf9f083 100644 (file)
@@ -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
 // ==========================
index 2fc4ef5..1b2b7f7 100644 (file)
@@ -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
index bd4c389..0204cd1 100644 (file)
 #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)
index 9c65db9..f656d64 100644 (file)
 #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;
index 65973f5..8b92221 100644 (file)
 #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\
 \
index 9dd1cc6..912d83c 100644 (file)
 #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;
index 34376c3..41a04fe 100644 (file)
@@ -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
index a9e9ea7..c9af594 100644 (file)
  * 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();
index 9ed47ec..6c562fc 100644 (file)
@@ -1,11 +1,6 @@
 #ifndef KEYCODES_H
 #define KEYCODES_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 ///////////////////////////
 // key constants
 
index 94ac814..99d88ba 100644 (file)
@@ -1,11 +1,6 @@
 #ifndef MENUDEFS_H
 #define MENUDEFS_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 //////////////////////////////////////////////////////////
 // sys globals
 
index e763813..0a94a9a 100644 (file)
@@ -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
index 868a6d6..86203cf 100644 (file)
@@ -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
index 50608d1..ec8f858 100644 (file)
@@ -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
index 2e24d62..47b2ed9 100644 (file)
@@ -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)
index cf966c6..ba8db39 100644 (file)
@@ -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;
index 22668c7..6eced2f 100644 (file)
@@ -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
index db572d4..cdc469a 100644 (file)
@@ -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
index 0eabcae..f192568 100644 (file)
@@ -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
index aea16a7..aaa78d9 100644 (file)
@@ -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
index 3122cdf..8fa3faa 100644 (file)
@@ -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
index eacb19f..3f24d1d 100644 (file)
@@ -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();
index 28fbe67..33fd0dd 100644 (file)
@@ -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();
index 59d4611..d02a963 100644 (file)
@@ -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);
index 520460e..e826694 100644 (file)
@@ -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;
index 8442aa0..eafd2d2 100644 (file)
@@ -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
index 8feedfb..8eafb93 100644 (file)
@@ -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
index de94691..467e5fc 100644 (file)
@@ -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
index 24d01c7..10d32ce 100644 (file)
@@ -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
index c43b66d..c2f1d86 100644 (file)
@@ -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
index f7fbd9a..b107729 100644 (file)
@@ -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
index 1560100..925033c 100644 (file)
@@ -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;
index b00c839..3386d57 100644 (file)
@@ -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
index 123ce03..490361b 100644 (file)
@@ -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
index 2b2aaaf..a11ea85 100644 (file)
@@ -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
index 12dcd0a..77ed760 100644 (file)
@@ -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
index ea6d202..d3a97dd 100644 (file)
@@ -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
 // ===========================================
index 159a2a0..94b254a 100644 (file)
@@ -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
index 8f13084..03e5359 100644 (file)
@@ -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
index a3c957d..91e460e 100644 (file)
@@ -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;
index e8b7ce5..a761c5b 100644 (file)
@@ -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
index 9a1216c..55bbdd0 100644 (file)
@@ -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();
index a33ca3f..9be8b3d 100644 (file)
@@ -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);
index 446be4e..4ec3296 100644 (file)
@@ -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
  */
index f521903..4c9360f 100644 (file)
@@ -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();
index d7102cb..0b3868a 100644 (file)
@@ -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
index 00b8e98..6f306ae 100644 (file)
@@ -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
index a7c1edf..a0f361f 100644 (file)
@@ -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
index 002a434..44caa7b 100644 (file)
@@ -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
index 575b1fa..b8a075b 100644 (file)
@@ -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
index a0cd99e..f0d3cd3 100644 (file)
@@ -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
index aa28a25..0162f5d 100644 (file)
@@ -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
index 98b492e..68ea788 100644 (file)
@@ -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
index 611f7f0..c683e71 100644 (file)
@@ -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
index 195c4aa..9bb92c0 100644 (file)
@@ -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
index 5a01d40..9cdb6b7 100644 (file)
@@ -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
index b8b052d..4631fd4 100644 (file)
@@ -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
index afb34fa..591c81b 100644 (file)
@@ -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
index 9840325..1d13e45 100644 (file)
@@ -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
index c6c30c6..341c4bb 100644 (file)
@@ -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
index 98ba99c..9e20df3 100644 (file)
@@ -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
index 4dcc9df..3fa9f74 100644 (file)
@@ -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
index df89cfc..649fff3 100644 (file)
@@ -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"
index 9afbcd5..eb4cee2 100644 (file)
@@ -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;
index 7cb28b5..4fbfdb1 100644 (file)
@@ -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();
index 124fe1e..846ee25 100644 (file)
@@ -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;
 
index 4ebbc3e..58a7e59 100644 (file)
@@ -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
index 95408d3..c71b21a 100644 (file)
@@ -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
index 01c751d..5f98570 100644 (file)
@@ -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];
index 8458e57..d1fe4f3 100644 (file)
@@ -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.
  */
index e9a3bb9..6f18012 100644 (file)
@@ -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);
index 06b3204..d66da5a 100644 (file)
@@ -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
index 07c5209..8e5bd33 100644 (file)
@@ -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
index c31f226..f722214 100644 (file)
@@ -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.
index f3288a5..b9c3501 100644 (file)
@@ -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.
index 5d6d33d..181d441 100644 (file)
@@ -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
 
index 2ecb8e1..5c64d6b 100644 (file)
@@ -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"
 
index cd1abb8..8a76ecc 100644 (file)
@@ -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
index 4b85a82..37b76ee 100644 (file)
@@ -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;
 
index 6941b01..6618367 100644 (file)
@@ -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;
index bc52f41..7f4bd46 100644 (file)
@@ -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);
index 850d88a..2c37622 100644 (file)
@@ -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);
index c2243e7..21ca14d 100644 (file)
@@ -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);
 
index cc557c7..2e3efb6 100644 (file)
@@ -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);
index ccb4d5a..b1d4cbb 100644 (file)
@@ -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();
 
index 2015bf6..74662d1 100644 (file)
@@ -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;
index dbac4f1..29c4ef9 100644 (file)
@@ -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();
index 9eb3877..47bcade 100644 (file)
@@ -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;
 
index c953844..e654302 100644 (file)
@@ -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
index 7a9c832..4b6aac4 100644 (file)
@@ -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);
index 6062d26..892d326 100644 (file)
@@ -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
 
index b5b3f0e..6d1e488 100644 (file)
@@ -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
index c91f372..359a29a 100644 (file)
@@ -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();
 
index 64002cf..e6f1071 100644 (file)
@@ -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();