#include this

Initial move to #include
TODO: remove unused includes

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 01d0528f566292ba3c3e15160ed3799c6a88404c..abbd25ffd8ba40041322b62fee2577aafe85a286 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -37,7 +37,7 @@ $(QCCVERSIONFILE):
 FILES_CSPROGS = $(shell find client common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm)
 ../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/client\'
-       cd client && $(QCC) $(QCCFLAGS)
+       cd client && $(QCC) $(QCCFLAGS) -DCSQC
 
 server/precache-for-csqc.inc: $(FILES_CSPROGS)
        sh collect-precache.sh
@@ -45,12 +45,12 @@ server/precache-for-csqc.inc: $(FILES_CSPROGS)
 FILES_PROGS = $(shell find server common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm)
 ../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE) server/precache-for-csqc.inc
        @echo make[1]: Entering directory \`$(PWD)/server\'
-       cd server && $(QCC) $(QCCFLAGS)
+       cd server && $(QCC) $(QCCFLAGS) -DSVQC
 
 FILES_MENU = $(shell find menu common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm)
 ../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/menu\'
-       cd menu && $(QCC) $(QCCFLAGS)
+       cd menu && $(QCC) $(QCCFLAGS) -DMENUQC
 
 .PHONY: testcase
 testcase:

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index baf25e1cd9767b79cce7f51213694f1c426d55c1..2a6602405431487e211db7f77af93d48fb32353e 100644 (file)
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -1,3 +1,11 @@
+#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.
@@ -274,3 +282,4 @@ float uid2name_dialog;
 #define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1)
 
 float g_balance_porto_secondary;
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index e9591e51d8a40bc99a9f98d2f53b11da42ff60a7..4cbb1f818b89b99814cdb7cfc05e9ce8d080892f 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -1,3 +1,29 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+    #include "Defs.qc"
+    #include "../common/constants.qh"
+    #include "../common/stats.qh"
+    #include "../warpzonelib/client.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "../common/nades.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "../common/mapinfo.qh"
+    #include "command/cl_cmd.qh"
+    #include "autocvars.qh"
+    #include "../common/notifications.qh"
+    #include "../csqcmodellib/interpolate.qh"
+    #include "hud.qh"
+    #include "waypointsprites.qh"
+    #include "prandom.qh"
+    #include "tturrets.qh"
+    #include "main.qh"
+    #include "../csqcmodellib/cl_model.qh"
+    #include "shownames.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 // --------------------------------------------------------------------------
 // BEGIN REQUIRED CSQC FUNCTIONS
 //include "main.qh"

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index a2d728d0e3795b7447e97a51d4274e5961b1c520..505b4f19219ec7b07b5ed7e64e9ca2c74fb8a8e9 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -1,3 +1,26 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../common/stats.qh"
+       #include "../warpzonelib/mathlib.qh"
+       #include "../warpzonelib/common.qh"
+       #include "../warpzonelib/client.qh"
+       #include "../common/teams.qh"
+       #include "../common/util.qh"
+       #include "../common/nades.qh"
+       #include "../common/weapons/weapons.qh"
+       #include "../common/mapinfo.qh"
+       #include "autocvars.qh"
+       #include "hud.qh"
+       #include "scoreboard.qh"
+       #include "noise.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_player.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 entity porto;
 vector polyline[16];
 void Porto_Draw()

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 9f74dacfa203b2c0817fb2bafd2938f88276af58..6c2462c3c62a89e404398ecd38f328794a3af406 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,3 +1,14 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+    #include "../common/stats.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "../common/notifications.qh"
+    #include "main.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 bool announcer_1min;
 bool announcer_5min;
 void Announcer_Countdown()

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index c4a4fab80780d59100f953f216c7e3abb37a9a64..bd1fc64e70ec8b829b9679aef1aef9aea28b121b 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -1,3 +1,40 @@
+#ifndef CLIENT_AUTOCVARS_H
+#define CLIENT_AUTOCVARS_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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;
@@ -466,3 +503,4 @@ vector autocvar_crosshair_rpc_color = '0.2 1.0 0.2';
 float autocvar_crosshair_rpc_alpha = 1;
 float autocvar_crosshair_rpc_size = 1;
 int autocvar_cl_nade_timer;
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc
index 716696f79da3f48583f9d0a9c3e5ac5efcb2ef18..348319ac09e1c615a5432bdea362e29971a0f0a1 100644 (file)
--- a/qcsrc/client/bgmscript.qc
+++ b/qcsrc/client/bgmscript.qc
@@ -1,3 +1,14 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/util.qh"
+       #include "autocvars.qh"
+       #include "bgmscript.qh"
+       #include "main.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 #define CONSTANT_SPEED_DECAY
 
 float bgmscriptbuf;

diff --git a/qcsrc/client/bgmscript.qh b/qcsrc/client/bgmscript.qh
index 713cf5798cd61184eaa2b1ecee096b9e4e36a569..51e11eba411e5d1449ae9afad2148b7488b7ad64 100644 (file)
--- a/qcsrc/client/bgmscript.qh
+++ b/qcsrc/client/bgmscript.qh
@@ -1,3 +1,51 @@
+#ifndef BGMSCRIPT_H
+#define BGMSCRIPT_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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;
@@ -8,3 +56,4 @@
 
 void BGMScript_InitEntity(entity e);
 float BGMScript(entity e);
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index d97e995576a24d138d88cfc3f65cdafee3a8685a..020781470686487df7b2fa31d942b1ba7ccfe4df 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -1,3 +1,18 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../common/util.qh"
+       #include "autocvars.qh"
+       #include "movetypes.qh"
+       #include "prandom.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 .bool silent;
 
 void Casing_Delete()

diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index edf265625aa21bb45eee669a8cdfafade443a115..09a899e9d61e7b520c42c0592b23e8190f770d94 100644 (file)
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -3,6 +3,20 @@
 //  Last updated: December 28th, 2011
 // ==============================================
 
+#if defined(CSQC)
+       #include "../../dpdefs/csprogsdefs.qc"
+       #include "../Defs.qc"
+       #include "../../common/util.qh"
+       #include "../../common/mapinfo.qh"
+       #include "../../common/command/shared_defs.qh"
+       #include "cl_cmd.qh"
+       #include "../autocvars.qh"
+       #include "../hud.qh"
+       #include "../main.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 void DrawDebugModel()
 {
        if(time - floor(time) > 0.5)

diff --git a/qcsrc/client/command/cl_cmd.qh b/qcsrc/client/command/cl_cmd.qh
index 85ab8a40a37a75aca4c1b74bf52fa8825774631b..4f48fed7f77df38dac26b450b9ad145a1048958d 100644 (file)
--- a/qcsrc/client/command/cl_cmd.qh
+++ b/qcsrc/client/command/cl_cmd.qh
@@ -1,10 +1,45 @@
+#ifndef CL_CMD_H
+#define CL_CMD_H
 // ==============================================
 //  CSQC client commands code, written by Samual
 //  Last updated: December 17th, 2011
 // ==============================================
 
+#if defined(CSQC)
+    #include "../../common/util-pre.qh"
+    #include "../sys-pre.qh"
+    #include "../../dpdefs/csprogsdefs.qc"
+    #include "../sys-post.qh"
+    #include "../Defs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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();
 
 // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file
 void LocalCommand_macro_write_aliases(int fh);
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 8ca0194577781c0ba622f938fc67bf22bfe38fd5..149b06ff31042f49708b9a11dc46dc47badfba0c 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -1,3 +1,25 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../warpzonelib/mathlib.qh"
+       #include "../common/teams.qh"
+       #include "../common/util.qh"
+       #include "../common/animdecide.qh"
+       #include "autocvars.qh"
+       #include "../csqcmodellib/interpolate.qh"
+       #include "main.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"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 void CSQCModel_Hook_PreDraw(bool isplayer);
 
 .bool isplayermodel;

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 544c365a9d19917f924b5a062c07186d3d9e1be9..54ec0615ab68dd268b1820ebfa0059dc8f4ad264 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -1,3 +1,19 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../common/util.qh"
+       #include "../common/weapons/weapons.qh"
+       #include "autocvars.qh"
+       #include "../common/deathtypes.qh"
+       #include "damage.qh"
+       #include "movetypes.qh"
+       #include "prandom.qh"
+       #include "vehicles/vehicles.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 void DamageEffect_Think()
 {
        // if particle distribution is enabled, slow ticrate by total number of damages

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

diff --git a/qcsrc/client/effects.qc b/qcsrc/client/effects.qc
index 56c83e06319ea1f6e7fc2b5f057c6bcb251e5d24..86038c17acfbd969c41fb3bc77f71e4c132c701e 100644 (file)
--- a/qcsrc/client/effects.qc
+++ b/qcsrc/client/effects.qc
@@ -1,3 +1,10 @@
+#if defined(CSQC)
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "autocvars.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 /*
 .vector fx_start;
 .vector fx_end;

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index 5d8543a781b532151fcba8f2c2f3a31896bed5ad..dcf4bfed485eb5f50df0e3939742336f68a54c17 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -1,3 +1,19 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../common/util.qh"
+       #include "../common/buffs.qh"
+       #include "autocvars.qh"
+       #include "movetypes.qh"
+       #include "prandom.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+       #include "../server/t_items.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 .bool silent;
 
 void Gib_Delete()

diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index b7c023b4d79a064e9145a657df8996022cff4ffa..2f2918b4cba22c2f24c6ddf1c06aa5de12f69741 100644 (file)
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -1,3 +1,20 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../warpzonelib/common.qh"
+       #include "../common/teams.qh"
+       #include "../common/util.qh"
+       #include "autocvars.qh"
+       #include "../csqcmodellib/interpolate.qh"
+       #include "noise.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 .float HookType; // ENT_CLIENT_*
 .vector origin;
 .vector velocity;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 9c733efbde33d63a1d6de74fc32b775570808742..080e0043669da29a6aef083b9535ff0ac8e5d63d 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1,3 +1,28 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../common/stats.qh"
+       #include "../warpzonelib/mathlib.qh"
+       #include "../common/teams.qh"
+       #include "../common/util.qh"
+       #include "../common/nades.qh"
+       #include "../common/buffs.qh"
+       #include "../common/counting.qh"
+       #include "../common/weapons/weapons.qh"
+       #include "../common/mapinfo.qh"
+       #include "autocvars.qh"
+       #include "../common/deathtypes.qh"
+       #include "teamradar.qh"
+       #include "hud.qh"
+       #include "scoreboard.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_player.qh"
+       #include "../server/t_items.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 /*
 ==================
 Misc HUD functions

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 85a1966baa284964e0b885a1518fda8f183e260c..563e33f633574c6d51aace75fd0986f83be5982c 100644 (file)
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -1,3 +1,46 @@
+#ifndef HUD_H
+#define HUD_H
+
+#if defined(CSQC)
+       #include "../common/util-pre.qh"
+       #include "sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "sys-post.qh"
+       #include "Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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;
@@ -356,3 +399,4 @@ void HUD_Notify_Push(string icon, string attacker, string victim);
 
 var void HUD_ModIcons_GameType(vector pos, vector size);
 void HUD_ModIcons_SetFunc();
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index e7f79fb2ddd91e61f0d4922e7253073e183c2578..e07ee484360a1bc75d31d8d09f0d680b546b142e 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #include "../common/constants.qh"
+       #include "autocvars.qh"
+       #include "hud.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 #define HUD_Write(s) fputs(fh, s)
 // q: quoted, n: not quoted
 #define HUD_Write_Cvar_n(cvar) HUD_Write(strcat("seta ", cvar, " ", cvar_string(cvar), "\n"))

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index d6a3d7d9c21a132710a5ae6e378ba1b66a62d34d..304ada9d312280ece903d953a58e8e4f48656e52 100644 (file)
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -1,3 +1,14 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../common/buffs.qh"
+       #include "../csqcmodellib/interpolate.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 // a laser goes from origin in direction angles
 // it has color 'colormod'
 // and stops when something is in the way

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 18efb2baa6f0807fced2a7ba2ccf06177fd3cd4d..405298feafb9c507cd4ed795350884b17352efb2 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -1,3 +1,55 @@
+#ifndef MAIN_H
+#define MAIN_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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
 
@@ -146,3 +198,4 @@ entity entcs_receiver[255]; // 255 is the engine limit on maxclients
 float hud;
 float view_quality;
 int framecount;
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 5bffcdee144564aef7628ad541627a2eccb8b638..d2ce7cb6e7ebdbdaf225107275abe6d5c7e97f4a 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -1,3 +1,17 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #include "../common/constants.qh"
+       #include "../common/util.qh"
+       #include "../common/mapinfo.qh"
+       #include "autocvars.qh"
+       #include "main.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 int mv_num_maps;
 
 float mv_active;

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 25741ce00e676611f8ff4c605491a5fa02d1af9e..ec539ee7d21e7bdc9879405b82e1685716b3ed15 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -1,3 +1,21 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../warpzonelib/mathlib.qh"
+       #include "../common/teams.qh"
+       #include "../common/util.qh"
+       #include "../common/command/generic.qh"
+       #include "../common/urllib.qh"
+       #include "autocvars.qh"
+       #include "hud.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 entity players;
 entity teams;
 float team_count; // real teams

diff --git a/qcsrc/client/modeleffects.qc b/qcsrc/client/modeleffects.qc
index 0f873b7e77de64b0f1958aaf571ae5e1f3c711f3..8034ab89bce47e04bc310e356759602592d80b94 100644 (file)
--- a/qcsrc/client/modeleffects.qc
+++ b/qcsrc/client/modeleffects.qc
@@ -1,3 +1,12 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 .float frame1time;
 .float lifetime, fadetime;
 .float teleport_time;

diff --git a/qcsrc/client/movetypes.qc b/qcsrc/client/movetypes.qc
index a1e9a65f7a6008717266c715e72173bbcae4aedb..abece4ca8632da52abe049696126a783c80bd081 100644 (file)
--- a/qcsrc/client/movetypes.qc
+++ b/qcsrc/client/movetypes.qc
@@ -1,3 +1,16 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/stats.qh"
+       #include "../common/util.qh"
+       #include "movetypes.qh"
+       #include "../csqcmodellib/common.qh"
+       #include "../server/t_items.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 const int MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE = 4;
 #define GRAVITY_UNAFFECTED_BY_TICRATE (getstati(STAT_MOVEFLAGS) & MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE)
 

diff --git a/qcsrc/client/movetypes.qh b/qcsrc/client/movetypes.qh
index db2266dfae27355e5424ef9db672100f28d81813..717c70a878fdc4bed6ea0e5f73f8788868602d78 100644 (file)
--- a/qcsrc/client/movetypes.qh
+++ b/qcsrc/client/movetypes.qh
@@ -1,3 +1,49 @@
+#ifndef MOVETYPES_H
+#define MOVETYPES_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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;
@@ -38,3 +84,4 @@ const int MOVETYPE_FLY_WORLDONLY    = 33;
 
 const int FL_ITEM                   = 256;
 const int FL_ONGROUND                          = 512;
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/noise.qc b/qcsrc/client/noise.qc
index ef9b8555234bb9d596106354538a86e014dbee30..da56f6cd87d2ba14fcab2b150c3f69f17f7c9f91 100644 (file)
--- a/qcsrc/client/noise.qc
+++ b/qcsrc/client/noise.qc
@@ -1,3 +1,10 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "noise.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 .float noise_baccum;
 .float noise_paccum;
 .float noise_paccum2;

diff --git a/qcsrc/client/noise.qh b/qcsrc/client/noise.qh
index 30ce4d0ee42a31bd43ecc2f206149e8dd56f98ea..d90e2c10d07c54b4569d3c5a3e89ba9d69743a50 100644 (file)
--- a/qcsrc/client/noise.qh
+++ b/qcsrc/client/noise.qh
@@ -1,5 +1,55 @@
+#ifndef NOISE_H
+#define NOISE_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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);
 float Noise_White(entity e, float dt);
 float Noise_Burst(entity e, float dt, float p); // +1 or -1
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc
index a8dd10c69e14138129cc92603ec743f4d27c9467..062c9687096c3ede137dea160b2abc9eb732273d 100644 (file)
--- a/qcsrc/client/particles.qc
+++ b/qcsrc/client/particles.qc
@@ -1,3 +1,18 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../common/constants.qh"
+       #include "../common/stats.qh"
+       #include "../warpzonelib/common.qh"
+       #include "../common/util.qh"
+       #include "../common/weapons/weapons.qh"
+       #include "autocvars.qh"
+       #include "bgmscript.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 .int dphitcontentsmask;
 
 .int cnt; // effect number

diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index 01cbfc605c0a4e3dc9ec9ffa21c494e5b9c9d730..82800ef8c5008a29a4b10d8757fa2aa549ed8e6b 100644 (file)
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -1,3 +1,12 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../common/util.qh"
+       #include "../csqcmodellib/interpolate.qh"
+       #include "player_skeleton.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 .float skeleton_info_modelindex;
 .float skeleton_info_skin;
 const int BONETYPE_LOWER = 0;

diff --git a/qcsrc/client/player_skeleton.qh b/qcsrc/client/player_skeleton.qh
index fdf5b3dfca8dec2bcab6c7c79ff23212f0337e19..63ef01871c0a51efc2d490e29826bdcf1c9cd164 100644 (file)
--- a/qcsrc/client/player_skeleton.qh
+++ b/qcsrc/client/player_skeleton.qh
@@ -1,3 +1,62 @@
+#ifndef PLAYER_SKELETON
+#define PLAYER_SKELETON
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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);
@@ -7,3 +66,4 @@ void skeleton_loadinfo(entity e);
 .float bone_aim[MAX_AIM_BONES];
 .float bone_aimweight[MAX_AIM_BONES];
 .float fixbone;
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/prandom.qc b/qcsrc/client/prandom.qc
index 9bca7b097335485fa11fcd5bc0dc98bb69a49bcb..ad3cd7dc93b0ccfd6ac3d89a49676e9e318be1a3 100644 (file)
--- a/qcsrc/client/prandom.qc
+++ b/qcsrc/client/prandom.qc
@@ -1,3 +1,11 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../warpzonelib/mathlib.qh"
+       #include "prandom.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 // prandom - PREDICTABLE random number generator (not seeded yet)
 
 #ifdef USE_PRANDOM

diff --git a/qcsrc/client/prandom.qh b/qcsrc/client/prandom.qh
index 7d5df6f8248cda6d10cb3baa7b0598dc3c260b99..609f085a1d7f7f54732bb8eebbf4d85650ca51f0 100644 (file)
--- a/qcsrc/client/prandom.qh
+++ b/qcsrc/client/prandom.qh
@@ -1,3 +1,50 @@
+#ifndef PRANDOM_H
+#define PRANDOM_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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
@@ -18,3 +65,4 @@ void prandom_debug();
 #define psrandom(x)
 #define prandom_debug()
 #endif
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/rubble.qc b/qcsrc/client/rubble.qc
index 7bf9e57ea67bc237041a28f1fc278c1c6daf7a1e..7f7c16269c5b6f6b58f3e9772fe2b323e113179e 100644 (file)
--- a/qcsrc/client/rubble.qc
+++ b/qcsrc/client/rubble.qc
@@ -1,3 +1,9 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 .float creationtime;
 
 // LordHavoc: rewrote this file, it was really bad code

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 5f4cbc1b801b0735ff9d493a90b946c7985a6f96..f1106f0df2773dad596ca2e7b75aace9177141b1 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1,3 +1,23 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../common/stats.qh"
+       #include "../common/teams.qh"
+       #include "../common/util.qh"
+       #include "../common/buffs.qh"
+       #include "../common/counting.qh"
+       #include "../common/weapons/weapons.qh"
+       #include "../common/mapinfo.qh"
+       #include "command/cl_cmd.qh"
+       #include "autocvars.qh"
+       #include "hud.qh"
+       #include "scoreboard.qh"
+       #include "main.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 float scoreboard_alpha_bg;
 float scoreboard_alpha_fg;
 float scoreboard_highlight;

diff --git a/qcsrc/client/scoreboard.qh b/qcsrc/client/scoreboard.qh
index 3e5de00f2dfba9b5e9df2141097cdf0f96febb16..4e3c766849f7449a4e9e6529382efa4e6bad726c 100644 (file)
--- a/qcsrc/client/scoreboard.qh
+++ b/qcsrc/client/scoreboard.qh
@@ -1,3 +1,48 @@
+#ifndef SCOREBOARD_H
+#define SCOREBOARD_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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;
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 5f40b268818d901270622114d56e429fd1772c0a..05fe0bbd14667b447398d30fe50b9862fa4d8aff 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -1,3 +1,19 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../common/teams.qh"
+       #include "../common/util.qh"
+       #include "../common/mapinfo.qh"
+       #include "autocvars.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+       #include "shownames.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+
 // self.isactive = player is in range and coordinates/status (health and armor) are up to date
 // self.origin = player origin TODO: should maybe move this so it's the origin of the shownames tag already in SSQC for culling?
 // self.healthvalue

diff --git a/qcsrc/client/shownames.qh b/qcsrc/client/shownames.qh
index adbfa57120376e5091f3c957d05557b9873de870..53632b77775906a5e49a26bbfc979f5ad05a69fe 100644 (file)
--- a/qcsrc/client/shownames.qh
+++ b/qcsrc/client/shownames.qh
@@ -1,5 +1,67 @@
+#ifndef SHOWNAMES_H
+#define SHOWNAMES_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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;
 .float fadedelay;
 .float pointtime;
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/sortlist.qc b/qcsrc/client/sortlist.qc
index 8537dd336f7a48ce871f5aaa4124b7f9f438dcb7..85601aa58cfd03cf6a63237f4d6ac8acf41ae597 100644 (file)
--- a/qcsrc/client/sortlist.qc
+++ b/qcsrc/client/sortlist.qc
@@ -1,3 +1,9 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 //.float(entity,entity) sort_cmp;
 .entity sort_next, sort_prev;
 

diff --git a/qcsrc/client/sys-post.qh b/qcsrc/client/sys-post.qh
index ec4e31ac33cb9adddb4b72d56165cf64439ec149..cf8ffef06eaa39f946ec79920bd46036a15d6fe0 100644 (file)
--- a/qcsrc/client/sys-post.qh
+++ b/qcsrc/client/sys-post.qh
@@ -1,3 +1,15 @@
+#ifndef SYS_POST_H
+#define SYS_POST_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 #pragma noref 0
 
 #undef ATTEN_NORM
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/sys-pre.qh b/qcsrc/client/sys-pre.qh
index 3b4fc14b59937301e04b5f69b8e8c3bc71a971ee..f6202b51c2c7613b94c74ba9dbab4d34ab36a53e 100644 (file)
--- a/qcsrc/client/sys-pre.qh
+++ b/qcsrc/client/sys-pre.qh
@@ -1,5 +1,14 @@
-#define CSQC
+#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
+
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 731c432af7c743ee2988829eda56dd436e6e83e2..87a48136eeb7b5d6c86dffcf21785bb4beb87857 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -1,3 +1,16 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../warpzonelib/common.qh"
+       #include "../common/util.qh"
+       #include "autocvars.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 float music_disabled;
 entity music_default;
 entity music_target;

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 3e361ffeb156c502bc82c25bc0d2205d7bb9ff55..de56efa7ef7d5966e11e85a81e02e98031f7add1 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -1,3 +1,17 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/util.qh"
+       #include "autocvars.qh"
+       #include "../csqcmodellib/interpolate.qh"
+       #include "teamradar.qh"
+       #include "hud.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 float teamradar_angle; // player yaw angle
 vector teamradar_origin3d_in_texcoord; // player origin
 vector teamradar_origin2d; // 2D origin

diff --git a/qcsrc/client/teamradar.qh b/qcsrc/client/teamradar.qh
index 2ab26a343d309e4a69580c9544548ad310c108b3..4b58fb975b13115a5033920e22df97904bd811bc 100644 (file)
--- a/qcsrc/client/teamradar.qh
+++ b/qcsrc/client/teamradar.qh
@@ -1,3 +1,45 @@
+#ifndef TEAMRADAR_H
+#define TEAMRADAR_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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
@@ -5,3 +47,4 @@ const int MAX_TEAMRADAR_TIMES = 32;
 .float teamradar_times[MAX_TEAMRADAR_TIMES];
 .int teamradar_time_index;
 .vector teamradar_color;
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index ec2ddebb71900c300a3a5f8bdb698a158ece3fb7..c46d80dce85caca48afbd6f6c7a46e6a21e048cc 100644 (file)
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -1,3 +1,23 @@
+#if defined(CSQC)
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "Defs.qc"
+    #include "../common/constants.qh"
+    #include "../warpzonelib/mathlib.qh"
+    #include "../common/teams.qh"
+    #include "../common/buffs.qh"
+    #include "autocvars.qh"
+    #include "teamradar.qh"
+    #include "movetypes.qh"
+    #include "tturrets.qh"
+    #include "../server/tturrets/include/turrets_early.qh"
+    #include "main.qh"
+    #include "../csqcmodellib/common.qh"
+    #include "../csqcmodellib/cl_model.qh"
+    #include "../server/t_items.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 string tid2info_base;
 string tid2info_head;
 string tid2info_name;

diff --git a/qcsrc/client/tturrets.qh b/qcsrc/client/tturrets.qh
index cf74f48ad2240563621311dbf88a427b64b0b8e8..da4df80e841680cf3b6b8a3d089c3c8140ae1a33 100644 (file)
--- a/qcsrc/client/tturrets.qh
+++ b/qcsrc/client/tturrets.qh
@@ -1,3 +1,54 @@
+#ifndef TTURRETS_H
+#define TTURRETS_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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;
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 8d2ba7fa6d76b904765e497cd275f1c3859a0ac9..aeb4ebeb04cfe72e237c3713e03d6a8a04af1c5a 100644 (file)
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../common/constants.qh"
+       #include "../warpzonelib/mathlib.qh"
+       #include "../common/util.qh"
+       #include "autocvars.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 const float TUBA_MIN = -18;
 const float TUBA_MAX =  27;
 const float TUBA_INSTRUMENTS = 3;

diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc
index a986fa7284c1bcea95013dd17cfb8fa5b8cfa9c4..e029e74ceeb4bce727ba877e26939770cb619535 100644 (file)
--- a/qcsrc/client/vehicles/vehicles.qc
+++ b/qcsrc/client/vehicles/vehicles.qc
@@ -1,3 +1,21 @@
+#if defined(CSQC)
+    #include "../../dpdefs/csprogsdefs.qc"
+    #include "../Defs.qc"
+    #include "../../common/constants.qh"
+    #include "../../common/stats.qh"
+    #include "../../common/util.qh"
+    #include "../../common/buffs.qh"
+    #include "../autocvars.qh"
+    #include "../movetypes.qh"
+    #include "../prandom.qh"
+    #include "../main.qh"
+    #include "vehicles.qh"
+    #include "../../csqcmodellib/cl_model.qh"
+    #include "../../server/t_items.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 const string hud_bg = "gfx/vehicles/frame.tga";
 const string hud_sh = "gfx/vehicles/vh-shield.tga";
 

diff --git a/qcsrc/client/vehicles/vehicles.qh b/qcsrc/client/vehicles/vehicles.qh
index 66b2af1bf68a42fc008a5075bd8d88f7f119c581..72ff23309c3923ebc728f67c9e25071bf3a7da58 100644 (file)
--- a/qcsrc/client/vehicles/vehicles.qh
+++ b/qcsrc/client/vehicles/vehicles.qh
@@ -1,4 +1,57 @@
+#ifndef VEHICLES_H
+#define VEHICLES_H
+
+#if defined(CSQC)
+    #include "../../common/util-pre.qh"
+    #include "../sys-pre.qh"
+    #include "../../dpdefs/csprogsdefs.qc"
+    #include "../sys-post.qh"
+    #include "../Defs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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();
-
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/wall.qc b/qcsrc/client/wall.qc
index 314e8cce3cb3f74b3f717b5e2bcb077daa4d336a..5bf5f04e79999d4a66146b8eb733539301a5b2bd 100644 (file)
--- a/qcsrc/client/wall.qc
+++ b/qcsrc/client/wall.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../common/util.qh"
+       #include "autocvars.qh"
+       #include "../csqcmodellib/interpolate.qh"
+       #include "bgmscript.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 .float lip;
 .float bgmscriptangular;
 .int lodmodelindex0, lodmodelindex1, lodmodelindex2;

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index de6970b38cd15247b384899e3aa32649ff4d62ae..bce02b963aee2b040ee23d5ce750a7ca4f53bde5 100644 (file)
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -1,3 +1,23 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "Defs.qc"
+       #include "../common/constants.qh"
+       #include "../warpzonelib/mathlib.qh"
+       #include "../common/teams.qh"
+       #include "../common/util.qh"
+       #include "../common/buffs.qh"
+       #include "../common/weapons/weapons.qh"
+       #include "autocvars.qh"
+       #include "../csqcmodellib/interpolate.qh"
+       #include "teamradar.qh"
+       #include "waypointsprites.qh"
+       #include "main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+       #include "../server/t_items.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 float waypointsprite_initialized;
 float waypointsprite_fadedistance;
 float waypointsprite_normdistance;

diff --git a/qcsrc/client/waypointsprites.qh b/qcsrc/client/waypointsprites.qh
index 94895083323964aeb3c3e1f6037cfb28acae90ad..32baea3a6ea0775c3b20c48bd714b25b351dcece 100644 (file)
--- a/qcsrc/client/waypointsprites.qh
+++ b/qcsrc/client/waypointsprites.qh
@@ -1,3 +1,49 @@
+#ifndef WAYPOINTSPRITES_H
+#define WAYPOINTSPRITES_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "sys-post.qh"
+    #include "Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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();
+#endif
\ No newline at end of file

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index a6302bb2866ef648a47f216fca379894ddec1cf7..ba8846277e38e16a84021596bab74c6308609edd 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -1,3 +1,22 @@
+#if defined(CSQC)
+       #include "../../dpdefs/csprogsdefs.qc"
+    #include "../Defs.qc"
+    #include "../../common/constants.qh"
+    #include "../../warpzonelib/anglestransform.qh"
+    #include "../../common/util.qh"
+    #include "../../common/nades.qh"
+    #include "../../common/buffs.qh"
+    #include "../autocvars.qh"
+    #include "../../csqcmodellib/interpolate.qh"
+    #include "../movetypes.qh"
+    #include "../main.qh"
+    #include "../../csqcmodellib/cl_model.qh"
+    #include "projectile.qh"
+    #include "../../server/t_items.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 .vector iorigin1, iorigin2;
 .float spawntime;
 .vector trail_oldorigin;

diff --git a/qcsrc/client/weapons/projectile.qh b/qcsrc/client/weapons/projectile.qh
index bd3e8f63be5f6802e5a143a462ede87571d08762..0fc233d52a4e22bb2dc188fd8fe934fd3adb3948 100644 (file)
--- a/qcsrc/client/weapons/projectile.qh
+++ b/qcsrc/client/weapons/projectile.qh
@@ -1,3 +1,62 @@
+#ifndef PROJECTILE_H
+#define PROJECTILE_H
+
+#if defined(CSQC)
+    #include "../../common/util-pre.qh"
+    #include "../sys-pre.qh"
+    #include "../../dpdefs/csprogsdefs.qc"
+    #include "../sys-post.qh"
+    #include "../Defs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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);
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index 8bd689c18740721dbeb37ba09688dd21962c8bc1..ba114f31e31e20e0023eddbdcd659d149be3d27a 100644 (file)
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "animdecide.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "util.qh"
+    #include "animdecide.qh"
+    #include "../server/defs.qh"
+#endif
+
 // player animation data for this model
 // each vector is as follows:
 // _x = startframe

diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh
index 58e06939246b5282ab913c83ed6d0be16ebe49b4..3f6815fe1f523ac902c257a3dd7460a6ecd135f5 100644 (file)
--- a/qcsrc/common/animdecide.qh
+++ b/qcsrc/common/animdecide.qh
@@ -1,3 +1,61 @@
+#ifndef ANIMDECIDE_H
+#define ANIMDECIDE_H
+
+#if defined(CSQC)
+    #include "util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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);
 
@@ -45,3 +103,4 @@ const int ANIMACTION_PAIN2 = 3; // pain
 const int ANIMACTION_SHOOT = 4; // shoot
 const int ANIMACTION_TAUNT = 5; // taunt
 const int ANIMACTION_MELEE = 6; // melee
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/buffs.qc b/qcsrc/common/buffs.qc
index 2f8e0fc23895dd34e773773a8cddf67f6bc266c8..ed592aa619d26ee58c4f507ec885495526c82e63 100644 (file)
--- a/qcsrc/common/buffs.qc
+++ b/qcsrc/common/buffs.qc
@@ -1,3 +1,14 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/Defs.qc"
+       #include "buffs.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "buffs.qh"
+#endif
+
 vector Buff_Color(float buff_id)
 {
        entity e;

diff --git a/qcsrc/common/buffs.qh b/qcsrc/common/buffs.qh
index d2ba5f01b9477310b50e03aaeaf01c0a67a54b37..b22c2fad6ce547607c6c939110b50c7a3c16ff89 100644 (file)
--- a/qcsrc/common/buffs.qh
+++ b/qcsrc/common/buffs.qh
@@ -1,3 +1,42 @@
+#ifndef BUFFS_H
+#define BUFFS_H
+
+#if defined(CSQC)
+       #include "util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
@@ -91,3 +130,4 @@ float Buff_Type_FromName(string buff_name);
 float Buff_Type_FromSprite(string buff_sprite);
 float Buff_Skin(float buff_id);
 string Buff_Sprite(float buff_id);
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/campaign_common.qh b/qcsrc/common/campaign_common.qh
index f6e240a6faf5bd4411a1919fc9badf34ddf56e04..7f72d352716f5c3e452130a8c30659f195110d89 100644 (file)
--- a/qcsrc/common/campaign_common.qh
+++ b/qcsrc/common/campaign_common.qh
@@ -1,3 +1,75 @@
+#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.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
@@ -28,3 +100,4 @@ void CampaignFile_Unload();
 // Sets up the campaign for the n-th array item (meaning: campaign_offset+nth
 // level) using localcmd()
 void CampaignSetup(float n);
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc
index d9864f4da7e1c73fc7300ee69bb61b3589cc051c..7031b92c9b7592cf1582efda6a26c11f676ac33a 100644 (file)
--- a/qcsrc/common/campaign_file.qc
+++ b/qcsrc/common/campaign_file.qc
@@ -1,3 +1,12 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "util.qh"
+    #include "campaign_common.qh"
+#endif
+
 // CampaignFileLoad(offset, n)
 // - Loads campaign level data (up to n entries starting at offset)
 //   into the globals

diff --git a/qcsrc/common/campaign_setup.qc b/qcsrc/common/campaign_setup.qc
index 525b2856d45e661c73aaae69d329ff3495daad42..fed2763d079d6dc2357f194ae29b9bde1d1f6b5d 100644 (file)
--- a/qcsrc/common/campaign_setup.qc
+++ b/qcsrc/common/campaign_setup.qc
@@ -1,3 +1,11 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "campaign_common.qh"
+    #include "mapinfo.qh"
+#endif
+
 void CampaignSetup(float n)
 {
        localcmd("set g_campaign 1\n");

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 0eeb7f7b4e470f83f317484650f32b5b1344e6a8..37f6ebd78255cd6bd76c5490ab351ea97532f405 100644 (file)
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -1,3 +1,31 @@
+#if defined(CSQC)
+       #include "../../dpdefs/csprogsdefs.qc"
+       #include "../constants.qh"
+       #include "../util.qh"
+       #include "../mapinfo.qh"
+       #include "generic.qh"
+       #include "shared_defs.qh"
+       #include "../../client/command/cl_cmd.qh"
+       #include "../notifications.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../server/sys-post.qh"
+    #include "../constants.qh"
+    #include "../util.qh"
+    #include "../test.qh"
+    #include "generic.qh"
+    #include "shared_defs.qh"
+    #include "../weapons/config.qh"
+    #include "../notifications.qh"
+    #include "../mapinfo.qh"
+    #include "../../server/command/common.qh"
+    #include "../../server/command/banning.qh"
+    #include "../../server/command/cmd.qh"
+    #include "../../server/command/sv_cmd.qh"
+#endif
+
 // =========================================================
 //  Generic program common command code, written by Samual
 //  Last updated: February 19th, 2012

diff --git a/qcsrc/common/command/generic.qh b/qcsrc/common/command/generic.qh
index b3a63e918b7df4807aeea074e84a92635ecc6243..3eb32430a61a349ee2134c72d0dd574242650c46 100644 (file)
--- a/qcsrc/common/command/generic.qh
+++ b/qcsrc/common/command/generic.qh
@@ -1,3 +1,73 @@
+#ifndef GENERIC_H
+#define GENERIC_H
+
+#if defined(CSQC)
+    #include "../util-pre.qh"
+    #include "../../client/sys-pre.qh"
+    #include "../../dpdefs/csprogsdefs.qc"
+    #include "../../client/sys-post.qh"
+    #include "../../client/Defs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -20,3 +90,4 @@ void Curl_URI_Get_Callback(int id, float status, string data);
 int curl_uri_get_pos;
 float curl_uri_get_exec[URI_GET_CURL_END - URI_GET_CURL + 1];
 string curl_uri_get_cvar[URI_GET_CURL_END - URI_GET_CURL + 1];
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/command/markup.qc b/qcsrc/common/command/markup.qc
index 1c80018ba83a7e2e3c615bb718cdf4e20bfea819..52b53b8f1d15d3f31f7fd70c7dc39ca40ab7e462 100644 (file)
--- a/qcsrc/common/command/markup.qc
+++ b/qcsrc/common/command/markup.qc
@@ -1,3 +1,14 @@
+#if defined(CSQC)
+       #include "../../dpdefs/csprogsdefs.qc"
+       #include "../util.qh"
+       #include "markup.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/dpextensions.qc"
+    #include "../util.qh"
+    #include "markup.qh"
+#endif
+
 // =========================================================
 //  Markup chat characters command code, reworked by Samual
 //  Last updated: December 28th, 2011

diff --git a/qcsrc/common/command/markup.qh b/qcsrc/common/command/markup.qh
index cf72f850eec1ca5f97716aeebce5755969c81d83..41fcf40042dac6c135262cc2da89259ab467cbfc 100644 (file)
--- a/qcsrc/common/command/markup.qh
+++ b/qcsrc/common/command/markup.qh
@@ -1,3 +1,67 @@
+#ifndef MARKUP_H
+#define MARKUP_H
+
+#if defined(CSQC)
+    #include "../util-pre.qh"
+    #include "../../client/sys-pre.qh"
+    #include "../../dpdefs/csprogsdefs.qc"
+    #include "../../client/sys-post.qh"
+    #include "../../client/Defs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -7,3 +71,4 @@ const int NUM_MARKUPS = 41;
 bool markup_init;
 string markup_from[NUM_MARKUPS];
 string markup_to[NUM_MARKUPS];
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/command/rpn.qc b/qcsrc/common/command/rpn.qc
index 480bac3c5559d1ec058b23ff5cc595ea490f81db..893633849a6b34c83a38cebb9f15ddcfe144cf0a 100644 (file)
--- a/qcsrc/common/command/rpn.qc
+++ b/qcsrc/common/command/rpn.qc
@@ -1,3 +1,22 @@
+#if defined(CSQC)
+       #include "../../dpdefs/csprogsdefs.qc"
+       #include "../../warpzonelib/mathlib.qh"
+       #include "../util.qh"
+       #include "rpn.qh"
+       #include "generic.qh"
+       #include "shared_defs.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../server/sys-post.qh"
+    #include "../../warpzonelib/mathlib.qh"
+    #include "../util.qh"
+    #include "rpn.qh"
+    #include "generic.qh"
+    #include "shared_defs.qh"
+#endif
+
 // ========================================
 //  RPN command code, written by divVerent
 //  Last updated: December 28th, 2011

diff --git a/qcsrc/common/command/rpn.qh b/qcsrc/common/command/rpn.qh
index 5f6856c3a942c9b9db25440fde528caafb29566d..ab02612ed49f8926c16fcfb28500e8ce355c2fe1 100644 (file)
--- a/qcsrc/common/command/rpn.qh
+++ b/qcsrc/common/command/rpn.qh
@@ -1,3 +1,70 @@
+#ifndef RPN_H
+#define RPN_H
+
+#if defined(CSQC)
+    #include "../util-pre.qh"
+    #include "../../client/sys-pre.qh"
+    #include "../../dpdefs/csprogsdefs.qc"
+    #include "../../client/sys-post.qh"
+    #include "../../client/Defs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -8,3 +75,4 @@ int rpn_db;
 int rpn_error;
 int rpn_sp;
 string rpn_stack[MAX_RPN_STACK];
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/command/shared_defs.qh b/qcsrc/common/command/shared_defs.qh
index 169b0f661ea48defeb342eae47058a3f22716ec3..a158f811a80543360d23df75ae442bdd8627e12a 100644 (file)
--- a/qcsrc/common/command/shared_defs.qh
+++ b/qcsrc/common/command/shared_defs.qh
@@ -1,3 +1,77 @@
+#ifndef SHARED_DEFS_H
+#define SHARED_DEFS_H
+
+#if defined(CSQC)
+    #include "../util-pre.qh"
+    #include "../../client/sys-pre.qh"
+    #include "../../dpdefs/csprogsdefs.qc"
+    #include "../../client/sys-post.qh"
+    #include "../../client/Defs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -5,4 +79,5 @@
 
 // identifiers for subfunction requests by the command code structure
 const int CMD_REQUEST_COMMAND = 1;
-const int CMD_REQUEST_USAGE = 2;
\ No newline at end of file
+const int CMD_REQUEST_USAGE = 2;
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index a110a818c0b74f62045962bcefaeffacee8403fa..baff2469b77b12ec6093ba94cfb71f1cf8a48a91 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -1,3 +1,39 @@
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
+
+#if defined(CSQC)
+    #include "util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+#elif defined(MENUQC)
+    #include "util-pre.qh"
+    #include "../menu/sys-pre.qh"
+    #include "../dpdefs/menudefs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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;
@@ -320,3 +356,4 @@ const int URI_GET_URLLIB_END = 191;
 const int GTV_AVAILABLE = 0;
 // for later use in per-map gametype filtering
 const int GTV_FORBIDDEN = 2;
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/counting.qh b/qcsrc/common/counting.qh
index 4a2007cf1942272319d517b98dc445fbdf8b4dc6..a271a55add86ecc86ed602fe5e0777c90e6b3cd2 100644 (file)
--- a/qcsrc/common/counting.qh
+++ b/qcsrc/common/counting.qh
@@ -1,3 +1,62 @@
+#ifndef COUNTING_H
+#define COUNTING_H
+
+#if defined(CSQC)
+       #include "util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
 // ===============================================
@@ -215,3 +274,4 @@ string process_time(float outputtype, float seconds)
        }
        return "";
 }
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh
index 54ef11117e67359683a258fb33f0421941cf7e7f..3b142fe9fd8772762b8b76a67c227e63e4215ca1 100644 (file)
--- a/qcsrc/common/csqcmodel_settings.qh
+++ b/qcsrc/common/csqcmodel_settings.qh
@@ -1,3 +1,116 @@
+#ifndef CSQCMODEL_SETTINGS_H
+#define CSQCMODEL_SETTINGS_H
+
+#if defined(CSQC)
+       #include "util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
 
@@ -78,3 +191,4 @@ const float CSQCPLAYER_FORCE_UPDATES = 0.25;
 #endif
 
 #define CSQCMODEL_EF_RESPAWNGHOST EF_SELECTABLE
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/deathtypes.qh b/qcsrc/common/deathtypes.qh
index 591c48e17800af077e7eea9536f32d46115e093e..e05f6a4d083e3bd7ced8239619d6f3ff25b98222 100644 (file)
--- a/qcsrc/common/deathtypes.qh
+++ b/qcsrc/common/deathtypes.qh
@@ -1,3 +1,87 @@
+#ifndef DEATHTYPES_H
+#define DEATHTYPES_H
+
+#if defined(CSQC)
+       #include "util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
 // ================================
@@ -131,3 +215,4 @@ const int HITTYPE_SPLASH = 0x200; // automatically set by RadiusDamage
 const int HITTYPE_BOUNCE = 0x400;
 const int HITTYPE_RESERVED2 = 0x800;
 const int HITTYPE_RESERVED = 0x1000; // unused yet
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 7299b285d51a6a7caca7f1d6e9d8df38bcb4e742..47978dd35a64084e29df8ae836dd8bdee9de0aea 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1,3 +1,21 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/Defs.qc"
+    #include "util.qh"
+    #include "buffs.qh"
+    #include "weapons/weapons.qh"
+    #include "mapinfo.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../server/sys-post.qh"
+    #include "util.qh"
+    #include "buffs.qh"
+    #include "monsters/monsters.qh"
+    #include "mapinfo.qh"
+#endif
+
 // generic string stuff
 
 float _MapInfo_Cache_Active;

diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index 1f7b7adfcff6765b49330eb4651cd859ad72ad4c..9733052e05573cfeee2143468a6a2aa68005e9da 100644 (file)
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@ -1,3 +1,95 @@
+#ifndef MAPINFO_H
+#define MAPINFO_H
+
+#if defined(CSQC)
+       #include "util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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;
@@ -165,3 +257,4 @@ void MapInfo_Shutdown(); // call this in the shutdown handler
 
 #define MAPINFO_SETTEMP_ACL_USER cvar_string("g_mapinfo_settemp_acl")
 #define MAPINFO_SETTEMP_ACL_SYSTEM "-g_mapinfo_* -rcon_* -_* -g_ban* +*"
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/monsters/monsters.qc b/qcsrc/common/monsters/monsters.qc
index 54cdf4ac45a9d71a4d8ccc4692754db8fa285e25..3b694a691267c3bac7ce6d47aba6705060c624de 100644 (file)
--- a/qcsrc/common/monsters/monsters.qc
+++ b/qcsrc/common/monsters/monsters.qc
@@ -1,3 +1,25 @@
+#if defined(CSQC)
+       #include "../../dpdefs/csprogsdefs.qc"
+       #include "../weapons/weapons.qh"
+       #include "monsters.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../warpzonelib/server.qh"
+    #include "../constants.qh"
+    #include "../util.qh"
+    #include "monsters.qh"
+    #include "sv_monsters.qh"
+    #include "../weapons/weapons.qh"
+    #include "../../server/t_items.qh"
+    #include "../../server/autocvars.qh"
+    #include "../../server/constants.qh"
+    #include "../../server/defs.qh"
+    #include "../deathtypes.qh"
+    #include "../../server/mutators/mutators_include.qh"
+    #include "../../csqcmodellib/sv_model.qh"
+#endif
 #include "all.qh"
 
 // MONSTER PLUGIN SYSTEM

diff --git a/qcsrc/common/monsters/monsters.qh b/qcsrc/common/monsters/monsters.qh
index 612822e6ec7f1e1868ff8e605d6228451adb8d4c..22beb2647150bfa1a7d1d2065cab93eb074b1f7f 100644 (file)
--- a/qcsrc/common/monsters/monsters.qh
+++ b/qcsrc/common/monsters/monsters.qh
@@ -1,3 +1,86 @@
+#ifndef MONSTERS_H
+#define MONSTERS_H
+
+#if defined(CSQC)
+       #include "../util-pre.qh"
+       #include "../../client/sys-pre.qh"
+       #include "../../dpdefs/csprogsdefs.qc"
+       #include "../../client/sys-post.qh"
+       #include "../../client/Defs.qc"
+       #include "../../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -65,3 +148,4 @@ int MON_LAST;
 
 #undef REGISTER_MONSTER
 ACCUMULATE_FUNCTION(RegisterMonsters, register_monsters_done);
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc
index e6b5db8e32dda2e37ec2a4e78bf9402439614126..0991ef621a6ae91c9ea2241f4a81e4aff4516129 100644 (file)
--- a/qcsrc/common/monsters/spawn.qc
+++ b/qcsrc/common/monsters/spawn.qc
@@ -1,3 +1,14 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../util.qh"
+    #include "monsters.qh"
+    #include "sv_monsters.qh"
+    #include "spawn.qh"
+    #include "../../server/autocvars.qh"
+    #include "../../server/defs.qh"
+#endif
 entity spawnmonster (string monster, float monster_id, entity spawnedby, entity own, vector orig, float respwn, float invincible, float moveflag)
 {
        // ensure spawnfunc database is initialized

diff --git a/qcsrc/common/monsters/spawn.qh b/qcsrc/common/monsters/spawn.qh
index 02d308677c708f3d6e0fcc2211463e73be4cc7e0..44ea1708bc2e7dbfbe9ff1c02a61a95ae36bb3dc 100644 (file)
--- a/qcsrc/common/monsters/spawn.qh
+++ b/qcsrc/common/monsters/spawn.qh
@@ -1 +1,36 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../server/sys-post.qh"
+    #include "../../warpzonelib/anglestransform.qh"
+    #include "../../warpzonelib/mathlib.qh"
+    #include "../../warpzonelib/common.qh"
+    #include "../../warpzonelib/util_server.qh"
+    #include "../../warpzonelib/server.qh"
+    #include "../constants.qh"
+    #include "../stats.qh"
+    #include "../teams.qh"
+    #include "../util.qh"
+    #include "../nades.qh"
+    #include "../buffs.qh"
+    #include "../test.qh"
+    #include "../counting.qh"
+    #include "../urllib.qh"
+    #include "../command/markup.qh"
+    #include "../command/rpn.qh"
+    #include "../command/generic.qh"
+    #include "../command/shared_defs.qh"
+    #include "../net_notice.qh"
+    #include "../animdecide.qh"
+    #include "monsters.qh"
+    #include "sv_monsters.qh"
+#endif
 entity spawnmonster (string monster, float monster_id, entity spawnedby, entity own, vector orig, float respwn, float invincible, float moveflag);
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index d5cd1f3e4c0c38ba184c85076480f15d5e167b59..7dadaee6406c83de3b4620efd9deaba11ae7591b 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1,3 +1,30 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../server/sys-post.qh"
+    #include "../../warpzonelib/common.qh"
+    #include "../constants.qh"
+    #include "../teams.qh"
+    #include "../util.qh"
+    #include "monsters.qh"
+    #include "sv_monsters.qh"
+    #include "../weapons/weapons.qh"
+    #include "../../server/autocvars.qh"
+    #include "../../server/defs.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 "../../server/command/common.qh"
+    #include "../../server/command/cmd.qh"
+    #include "../../csqcmodellib/sv_model.qh"
+    #include "../../server/round_handler.qh"
+    #include "../../server/tturrets/include/turrets.qh"
+#endif
+
 // =========================
 //     SVQC Monster Properties
 // =========================

diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh
index 159ade2e32622a8a16bb57ea822b9404c219d943..1a3522aef0957d92cae099033725e4924b3c065d 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qh
+++ b/qcsrc/common/monsters/sv_monsters.qh
@@ -1,3 +1,37 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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;
 
@@ -86,3 +120,4 @@ const int MONSTER_MOVE_ENEMY = 5; // used only as a movestate
 
 const int MONSTER_STATE_ATTACK_LEAP = 1;
 const int MONSTER_STATE_ATTACK_MELEE = 2;
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/nades.qc b/qcsrc/common/nades.qc
index e0d5cbc8118f8fb0be535b5ef9168f1f4615b492..b90ba4c2e8dc8dfc130deab75d11a32e81ffe5a4 100644 (file)
--- a/qcsrc/common/nades.qc
+++ b/qcsrc/common/nades.qc
@@ -1,3 +1,19 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/Defs.qc"
+       #include "nades.qh"
+       #include "buffs.qh"
+       #include "../client/movetypes.qh"
+       #include "../server/tturrets/include/turrets_early.qh"
+       #include "../client/main.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "constants.qh"
+    #include "../server/constants.qh"
+#endif
+
 .float healer_lifetime;
 .float healer_radius;
 

diff --git a/qcsrc/common/nades.qh b/qcsrc/common/nades.qh
index b87375808d8e5641122492d988d65809d71b531a..49fad4a5504a41038ba2067cf2c33d60f64ca22a 100644 (file)
--- a/qcsrc/common/nades.qh
+++ b/qcsrc/common/nades.qh
@@ -1,3 +1,40 @@
+#ifndef NADES_H
+#define NADES_H
+
+#if defined(CSQC)
+       #include "util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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;
@@ -101,3 +138,4 @@ string Nade_TrailEffect(float proj, float nade_team)
 // misc functions
 void ent_healer();
 #endif // CSQC
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/net_notice.qc b/qcsrc/common/net_notice.qc
index 084c83c22b1fe175895610b033cc9f30dca926e6..2197b9ee533d0157b18321570572bd6c58446452 100644 (file)
--- a/qcsrc/common/net_notice.qc
+++ b/qcsrc/common/net_notice.qc
@@ -1,3 +1,16 @@
+#if defined(CSQC)
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/Defs.qc"
+    #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "constants.qh"
+    #include "net_notice.qh"
+    #include "../server/defs.qh"
+#endif
+
 #ifdef SVQC
 void sv_notice_join_think()
 {

diff --git a/qcsrc/common/net_notice.qh b/qcsrc/common/net_notice.qh
index d94f1d98f2d8add69c1ea81f0bcd4571ba758b0b..67621b588e0c58e3d24295a025bc5917cea4915f 100644 (file)
--- a/qcsrc/common/net_notice.qh
+++ b/qcsrc/common/net_notice.qh
@@ -1,3 +1,34 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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);
@@ -11,3 +42,4 @@ void sv_notice_to(entity _to, string _notice, float _howlong, float _modal);
 void sv_notice_toall(string _notice, float _howlong, float _modal);
 void sv_notice_join();
 #endif
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 9391c6bc7727ce040e65c79d2fcfdb63781b8c12..64daa613f894df703313f96310f9f84a334d1322 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -1,3 +1,28 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/Defs.qc"
+       #include "teams.qh"
+       #include "util.qh"
+       #include "buffs.qh"
+       #include "counting.qh"
+       #include "weapons/weapons.qh"
+       #include "../client/autocvars.qh"
+       #include "notifications.qh"
+       #include "../client/main.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "constants.qh"
+    #include "teams.qh"
+    #include "counting.qh"
+    #include "../server/autocvars.qh"
+    #include "../server/constants.qh"
+    #include "../server/defs.qh"
+    #include "notifications.qh"
+    #include "../server/mutators/mutators_include.qh"
+#endif
+
 // ================================================
 //  Unified notification system, written by Samual
 //  Last updated: August, 2013

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 6844d627442369964fd664de1a8001c391ac9c30..b905f67061ec282c21038e7e6850bb9305bfb537 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -1,3 +1,85 @@
+#ifndef NOTIFICATIONS_H
+#define NOTIFICATIONS_H
+
+#if defined(CSQC)
+    #include "util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
@@ -1643,3 +1725,4 @@ ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotifications_Done);
 #undef MSG_CHOICE_NOTIF
 
 #undef NOTIF_ADD_AUTOCVAR
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc
index 60af8294f090d8d882aadbd8513d517f76f9883c..b586ca4cdcf0a7f9c1c290f1a4d37c90af9ec043 100644 (file)
--- a/qcsrc/common/playerstats.qc
+++ b/qcsrc/common/playerstats.qc
@@ -1,3 +1,19 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../server/sys-post.qh"
+    #include "constants.qh"
+    #include "util.qh"
+    #include "urllib.qh"
+    #include "weapons/weapons.qh"
+    #include "../server/weapons/accuracy.qh"
+    #include "../server/defs.qh"
+    #include "playerstats.qh"
+    #include "../server/scores.qh"
+#endif
+
 #ifdef SVQC
 void PlayerStats_Prematch(void)
 {

diff --git a/qcsrc/common/playerstats.qh b/qcsrc/common/playerstats.qh
index 1e132eab72f5f4c9b6424b3468c50e25ac0d8e44..811e78ded708fef6d3c9788eb63b729d30fc5617 100644 (file)
--- a/qcsrc/common/playerstats.qh
+++ b/qcsrc/common/playerstats.qh
@@ -1,3 +1,97 @@
+#ifndef PLAYERSTATS_H
+#define PLAYERSTATS_H
+
+#if defined(CSQC)
+    #include "util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
@@ -113,3 +207,4 @@ void PlayerStats_PlayerDetail(void);
 void PlayerStats_PlayerDetail_CheckUpdate(void);
 void PlayerStats_PlayerDetail_Handler(entity fh, entity p, float status);
 #endif
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index 2bf147fd4a49cf89e631099798a6650d83f313c4..b1aeb017ab33fa50f16b0dd6e5d0ace324e6b3f0 100644 (file)
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -1,4 +1,30 @@
-// Full list of all stat constants, icnluded in a single location for easy reference
+#ifndef STATS_H
+#define STATS_H
+
+#if defined(CSQC)
+    #include "util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #include "constants.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "util-pre.qh"
+    #include "../server/sys-pre.qh"
+    #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
 
 const int MAX_CL_STATS                = 256;
@@ -288,3 +314,4 @@ const int STAT_MOVEVARS_MAXAIRSPEED                   = 252;
 const int STAT_MOVEVARS_STEPHEIGHT                    = 253;
 const int STAT_MOVEVARS_AIRACCEL_QW                   = 254;
 const int STAT_MOVEVARS_AIRACCEL_SIDEWAYS_FRICTION    = 255;
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh
index 679405f3b532e6d41a3b62c44f2770fde103af74..388b994e19d8a29abce8d1470c8c0ea1e52bed59 100644 (file)
--- a/qcsrc/common/teams.qh
+++ b/qcsrc/common/teams.qh
@@ -1,3 +1,47 @@
+#ifndef TEAMS_H
+#define TEAMS_H
+
+#if defined(CSQC)
+       #include "util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
@@ -165,3 +209,4 @@ float Team_TeamToNumber(float teamid)
 #define APP_TEAM_NUM_4(num,prefix) ((num == NUM_TEAM_1) ? prefix##RED : ((num == NUM_TEAM_2) ? prefix##BLUE : ((num == NUM_TEAM_3) ? prefix##YELLOW : prefix##PINK)))
 #define APP_TEAM_ENT_2(ent,prefix) ((ent.team == NUM_TEAM_1) ? prefix##RED : prefix##BLUE)
 #define APP_TEAM_ENT_4(ent,prefix) ((ent.team == NUM_TEAM_1) ? prefix##RED : ((ent.team == NUM_TEAM_2) ? prefix##BLUE : ((ent.team == NUM_TEAM_3) ? prefix##YELLOW : prefix##PINK)))
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/test.qc b/qcsrc/common/test.qc
index 53b4476ae1f55e01c7bcc25b2b10fb0758aeeb02..3599819e7d02c5badc0fb262e5a97c69f6325257 100644 (file)
--- a/qcsrc/common/test.qc
+++ b/qcsrc/common/test.qc
@@ -1,3 +1,12 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "test.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/dpextensions.qc"
+    #include "test.qh"
+#endif
+
 float TEST_failed;
 float TEST_ok;
 

diff --git a/qcsrc/common/test.qh b/qcsrc/common/test.qh
index ff442cef9b779e87882f85dc03140fc3755766ee..6cda6f2968cd74fd913cd822013d9e64a613dac2 100644 (file)
--- a/qcsrc/common/test.qh
+++ b/qcsrc/common/test.qh
@@ -1,3 +1,52 @@
+#ifndef TEST_H
+#define TEST_H
+
+#if defined(CSQC)
+    #include "util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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();
@@ -5,3 +54,4 @@ void TEST_Fail(string cond);
 
 float TEST_RunAll();
 float TEST_Run(string test);
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/urllib.qc b/qcsrc/common/urllib.qc
index 518b207fca24bb5b63222c22d9ac80c8b43d73df..2ab046cd93213be436bcf0c9618b763f0c8e45d3 100644 (file)
--- a/qcsrc/common/urllib.qc
+++ b/qcsrc/common/urllib.qc
@@ -1,3 +1,18 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "constants.qh"
+       #include "util.qh"
+       #include "urllib.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../server/sys-post.qh"
+    #include "constants.qh"
+    #include "util.qh"
+    #include "urllib.qh"
+#endif
+
 // files
 .float url_fh;
 const float URL_FH_CURL = -1;

diff --git a/qcsrc/common/urllib.qh b/qcsrc/common/urllib.qh
index 6353c33fef643404c63b2dd16824c9bf9ae0a5ad..4999a1d0446cc683216ef8be2063645561c0a758 100644 (file)
--- a/qcsrc/common/urllib.qh
+++ b/qcsrc/common/urllib.qh
@@ -1,3 +1,75 @@
+#ifndef URLLIB_H
+#define URLLIB_H
+
+#if defined(CSQC)
+    #include "util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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;
@@ -16,3 +88,4 @@ float url_URI_Get_Callback(float id, float status, string data);
 #define NUM_URL_ID (URI_GET_URLLIB_END - URI_GET_URLLIB + 1)
 
 void url_multi_fopen(string url, float mode, url_ready_func rdy, entity pass);
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index bba5af1f4ffb85b5d1070311414529669d1619a0..d8bd8636ab29e3fb39f02b96a147571fd642761e 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -1,3 +1,11 @@
+#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
@@ -28,3 +36,4 @@
     const bool true    = 1;
     const bool false   = 0;
 #endif
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 7b3df7f77ccb9ad0e577162a441173021db00642..2d5170dcbfa4e0c4c39f960c6c1db85677046c2f 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1,3 +1,27 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/Defs.qc"
+    #include "constants.qh"
+    #include "../warpzonelib/mathlib.qh"
+    #include "util.qh"
+    #include "mapinfo.qh"
+    #include "notifications.qh"
+    #include "deathtypes.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../server/sys-post.qh"
+    #include "../warpzonelib/mathlib.qh"
+    #include "constants.qh"
+    #include "util.qh"
+    #include "../server/autocvars.qh"
+    #include "../server/defs.qh"
+    #include "notifications.qh"
+    #include "deathtypes.qh"
+    #include "mapinfo.qh"
+#endif
+
 string wordwrap_buffer;
 
 void wordwrap_buffer_put(string s)

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 3d4e9b9e9ea673d1a30207930b0485b9158d8834..efe6d30ec2070e78590f9889cc06e29ca2123716 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -1,3 +1,45 @@
+#ifndef COMMON_UTIL_H
+#define COMMON_UTIL_H
+
+#if defined(CSQC)
+       #include "util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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(); }
@@ -441,4 +483,5 @@ vector bezier_quadratic_getderivative(vector a, vector p, vector b, float t);
 #define APPEND_TO_STRING(list,sep,add) ((list) = (((list) != "") ? strcat(list, sep, add) : (add)))
 
 // Returns the correct difference between two always increasing numbers
-#define COMPARE_INCREASING(to,from) (to < from ? from + to + 2 : to - from)
\ No newline at end of file
+#define COMPARE_INCREASING(to,from) (to < from ? from + to + 2 : to - from)
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc
index 3a41d094ff573e316993d592e7891b6ac247e60f..ab6e7905cb003d2c3cf2f0c01807337b41bcb1ba 100644 (file)
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../util.qh"
+    #include "config.qh"
+    #include "weapons.qh"
+#endif
+
 // ==========================
 //  Balance Config Generator
 // ==========================

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index 4412c0c6c8974f2ea83720b3247b88cabdc40e85..affba63a09fef4b252a3810621a7de4c4b05f264 100644 (file)
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -1,13 +1,49 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
 // ==========================
 
 void Dump_Weapon_Settings(void);
-float wep_config_file;
-float wep_config_alsoprint;
+int wep_config_file;
+bool wep_config_alsoprint;
 
-const float MAX_WEP_CONFIG = 256;
-float WEP_CONFIG_COUNT;
+const int MAX_WEP_CONFIG = 256;
+int WEP_CONFIG_COUNT;
 string wep_config_queue[MAX_WEP_CONFIG];
 
 #define WEP_CONFIG_QUEUE(a) { \
@@ -43,3 +79,4 @@ string wep_config_queue[MAX_WEP_CONFIG];
                cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) }
 
 #define WEP_CONFIG_WRITE_PROPS(wepid,wepname,type,prop,name) WEP_CONFIG_WRITE_PROPS_##type(wepname,name)
+#endif
\ No newline at end of file

diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/weapons.qc
index 7b91f1d3007258b799dd5de3fd81a684197ac580..ff97b16c51d7fc9dcccf0621e3eee07560c42363 100644 (file)
--- a/qcsrc/common/weapons/weapons.qc
+++ b/qcsrc/common/weapons/weapons.qc
@@ -1,3 +1,54 @@
+#if defined(CSQC)
+       #include "../../dpdefs/csprogsdefs.qc"
+       #include "../../client/Defs.qc"
+       #include "../constants.qh"
+       #include "../stats.qh"
+       #include "../../warpzonelib/anglestransform.qh"
+       #include "../../warpzonelib/mathlib.qh"
+       #include "../../warpzonelib/common.qh"
+       #include "../../warpzonelib/client.qh"
+       #include "../util.qh"
+       #include "../buffs.qh"
+       #include "weapons.qh"
+       #include "../../client/autocvars.qh"
+       #include "../deathtypes.qh"
+       #include "../../csqcmodellib/interpolate.qh"
+       #include "../../client/movetypes.qh"
+       #include "../../client/main.qh"
+       #include "../../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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 "../buffs.qh"
+    #include "../monsters/monsters.qh"
+    #include "config.qh"
+    #include "weapons.qh"
+    #include "../../server/weapons/csqcprojectile.qh"
+    #include "../../server/weapons/tracing.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 "../mapinfo.qh"
+    #include "../../server/command/common.qh"
+    #include "../../csqcmodellib/sv_model.qh"
+    #include "../../server/portals.qh"
+    #include "../../server/g_hook.qh"
+#endif
 #ifndef MENUQC
 #include "calculations.qc"
 #endif

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index 1b0061e6670812465e68a34327fd2fe47fcd47c9..00ee68b4ea6dd4facb6aa1569764feff3bdd9eb2 100644 (file)
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -1,3 +1,74 @@
+#ifndef WEAPONS_H
+#define WEAPONS_H
+
+#if defined(CSQC)
+       #include "../util-pre.qh"
+       #include "../../client/sys-pre.qh"
+       #include "../../dpdefs/csprogsdefs.qc"
+       #include "../../client/sys-post.qh"
+       #include "../../client/Defs.qc"
+       #include "../../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -206,3 +277,4 @@ void register_weapons_done();
 #undef REGISTER_WEAPON
 
 ACCUMULATE_FUNCTION(RegisterWeapons, register_weapons_done);
+#endif
\ No newline at end of file

diff --git a/qcsrc/csqcmodellib/cl_model.qc b/qcsrc/csqcmodellib/cl_model.qc
index 78150ddd50964cf14e3a74ff74cdc676b81d034e..83355d654bf7386209e1e700f4b51f72460caedf 100644 (file)
--- a/qcsrc/csqcmodellib/cl_model.qc
+++ b/qcsrc/csqcmodellib/cl_model.qc
@@ -19,6 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+ #if defined(CSQC)
+        #include "../dpdefs/csprogsdefs.qc"
+        #include "../client/Defs.qc"
+        #include "../common/util.qh"
+        #include "../common/animdecide.qh"
+        #include "interpolate.qh"
+        #include "../common/csqcmodel_settings.qh"
+        #include "common.qh"
+        #include "cl_model.qh"
+        #include "cl_player.qh"
+ #elif defined(MENUQC)
+ #elif defined(SVQC)
+ #endif
 
 float autocvar_cl_lerpanim_maxdelta_framegroups = 0.1;
 float autocvar_cl_nolerp = 0;

diff --git a/qcsrc/csqcmodellib/cl_model.qh b/qcsrc/csqcmodellib/cl_model.qh
index ded7357419221c50305a1a907df5d355d995fb54..f49f800fba6bd224fec192a31c3cf17499cf58f7 100644 (file)
--- a/qcsrc/csqcmodellib/cl_model.qh
+++ b/qcsrc/csqcmodellib/cl_model.qh
@@ -19,6 +19,61 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+#ifndef CL_MODEL_H
+#define CL_MODEL_H
+
+#if defined(CSQC)
+       #include "../common/util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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);
 
@@ -48,3 +103,4 @@ void CSQCModel_InterpolateAnimation_1To2_Note(float sf, float set_times);
 void CSQCModel_InterpolateAnimation_2To4_Do();
 void CSQCModel_InterpolateAnimation_1To2_Do();
 // will overwrite lerpfrac, lerpfrac3, lerpfrac4, and possibly clear frame*time if they are undisplayed according to lerpfracs
+#endif
\ No newline at end of file

diff --git a/qcsrc/csqcmodellib/cl_player.qc b/qcsrc/csqcmodellib/cl_player.qc
index 64fe370a2c3cb58b66e4efb74de034bf75f5ac99..1cc357f586381bc5bfa7504a932e6328634e320a 100644 (file)
--- a/qcsrc/csqcmodellib/cl_player.qc
+++ b/qcsrc/csqcmodellib/cl_player.qc
@@ -19,6 +19,20 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/Defs.qc"
+       #include "../common/constants.qh"
+       #include "../common/stats.qh"
+       #include "../common/util.qh"
+       #include "interpolate.qh"
+       #include "../client/main.qh"
+       #include "common.qh"
+       #include "cl_model.qh"
+       #include "cl_player.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
 
 float autocvar_cl_movement_errorcompensation = 0;
 

diff --git a/qcsrc/csqcmodellib/cl_player.qh b/qcsrc/csqcmodellib/cl_player.qh
index 92ac5481e9cd31d24330a5dd0b04dacb7346d153..917c58e2fc69ee1bc2c6a591249d6a7e4f8b0f3e 100644 (file)
--- a/qcsrc/csqcmodellib/cl_player.qh
+++ b/qcsrc/csqcmodellib/cl_player.qh
@@ -19,6 +19,62 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+#ifndef CL_PLAYER_H
+#define CL_PLAYER_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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;
@@ -36,3 +92,4 @@ void CSQCPlayer_SetCamera();
 float CSQCPlayer_PreUpdate();
 float CSQCPlayer_PostUpdate();
 float CSQCPlayer_IsLocalPlayer();
+#endif
\ No newline at end of file

diff --git a/qcsrc/csqcmodellib/common.qh b/qcsrc/csqcmodellib/common.qh
index 8cd5aa698584e7c16de265bb134b7c7338f7b833..39325b519286a4fba672faba1fb528db54a5e5dd 100644 (file)
--- a/qcsrc/csqcmodellib/common.qh
+++ b/qcsrc/csqcmodellib/common.qh
@@ -19,6 +19,120 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+#ifndef CSQCMODELLIB_COMMON_H
+#define CSQCMODELLIB_COMMON_H
+
+#if defined(CSQC)
+       #include "../common/util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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\
@@ -90,3 +204,4 @@ const int CSQCMODEL_PROPERTY_SIZE = 32768;
 #else
 #define ALLPROPERTIES ALLPROPERTIES_COMMON
 #endif
+#endif
\ No newline at end of file

diff --git a/qcsrc/csqcmodellib/interpolate.qc b/qcsrc/csqcmodellib/interpolate.qc
index 4632cec46d3c74f268cc76817ad1fd6509953f7a..583f41f8fce8b2a38e63e3fefca732f2d4282ec7 100644 (file)
--- a/qcsrc/csqcmodellib/interpolate.qc
+++ b/qcsrc/csqcmodellib/interpolate.qc
@@ -19,6 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/Defs.qc"
+       #include "../warpzonelib/anglestransform.qh"
+       #include "../client/autocvars.qh"
+       #include "interpolate.qh"
+       #include "cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
 
 .vector iorigin1, iorigin2;
 .vector ivelocity1, ivelocity2;

diff --git a/qcsrc/csqcmodellib/interpolate.qh b/qcsrc/csqcmodellib/interpolate.qh
index a29fdc46db2b2ff37d6c382d009af6b9e950214d..9aade3b68b81a541d34e7195793545324d2f9c1a 100644 (file)
--- a/qcsrc/csqcmodellib/interpolate.qh
+++ b/qcsrc/csqcmodellib/interpolate.qh
@@ -19,6 +19,46 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+#ifndef INTERPOLATE_H
+#define INTERPOLATE_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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;
@@ -47,3 +87,4 @@ void InterpolateOrigin_Do();
 
 // in case we interpolate that:
 .vector v_angle;
+#endif
\ No newline at end of file

diff --git a/qcsrc/csqcmodellib/sv_model.qc b/qcsrc/csqcmodellib/sv_model.qc
index cbc26213cea2e54dd265ab931de3f7b635090461..9ac6ed02ee57692e5f56805293a749fb0c5ea96f 100644 (file)
--- a/qcsrc/csqcmodellib/sv_model.qc
+++ b/qcsrc/csqcmodellib/sv_model.qc
@@ -20,6 +20,20 @@
  * IN THE SOFTWARE.
  */
 
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+       #include "../dpdefs/dpextensions.qc"
+       #include "../common/constants.qh"
+       #include "../common/util.qh"
+       #include "../common/animdecide.qh"
+       #include "../server/constants.qh"
+       #include "../server/defs.qh"
+       #include "common.qh"
+       #include "sv_model.qh"
+#endif
+
 // generic CSQC model code
 
 float CSQCModel_Send(entity to, float sf)

diff --git a/qcsrc/csqcmodellib/sv_model.qh b/qcsrc/csqcmodellib/sv_model.qh
index 3c4ce2b78615971c09c545a9874efd116f21ff4d..a4bbd45587d4fb783c359aa148dfac2c6fe1cd1f 100644 (file)
--- a/qcsrc/csqcmodellib/sv_model.qh
+++ b/qcsrc/csqcmodellib/sv_model.qh
@@ -1,3 +1,5 @@
+#ifndef SV_MODEL_H
+#define SV_MODEL_H
 /*
  * Copyright (c) 2011 Rudolf Polzer
  *
@@ -20,6 +22,72 @@
  * 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.qc"
+       #include "../dpdefs/dpextensions.qc"
+       #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();
@@ -37,3 +105,4 @@ void CSQCModel_UnlinkEntity();
 #undef CSQCMODEL_PROPERTY
 #undef CSQCMODEL_ENDIF
 #undef CSQCMODEL_IF
+#endif
\ No newline at end of file

diff --git a/qcsrc/dpdefs/csprogsdefs.qc b/qcsrc/dpdefs/csprogsdefs.qc
index 3a318cc4a73bc67deb8ce9df678d8fe6903a5e53..dac4c1651a7fb62a61560676a2663f95937a060f 100644 (file)
--- a/qcsrc/dpdefs/csprogsdefs.qc
+++ b/qcsrc/dpdefs/csprogsdefs.qc
@@ -1,3 +1,5 @@
+#ifndef CSPROGSDEFS_H
+#define CSPROGSDEFS_H
 /*
 ==============================================================================
 
@@ -1442,3 +1444,4 @@ vector gettaginfo_forward;
 vector gettaginfo_right;
 vector gettaginfo_up;
 float checkpvs(vector viewpos, entity viewee) = #240;
+#endif
\ No newline at end of file

diff --git a/qcsrc/dpdefs/dpextensions.qc b/qcsrc/dpdefs/dpextensions.qc
index a38746e5959a5bb4fcb9bd67d444ea9f36ddd60b..443d3248badbef568450ad3ab21d7d70b19d98f5 100644 (file)
--- a/qcsrc/dpdefs/dpextensions.qc
+++ b/qcsrc/dpdefs/dpextensions.qc
@@ -1,3 +1,5 @@
+#ifndef DPEXTENSIONS_H
+#define DPEXTENSIONS_H
 //DarkPlaces supported extension list, draft version 1.04
 
 //things that don't have extensions yet:
@@ -2553,3 +2555,4 @@ void(float pause) setpause = #531;
 float(string url, float id, string content_type, string delim, float buf, float keyid) crypto_uri_postbuf = #513;
 //description:
 //use -1 as buffer handle to justs end delim as postdata
+#endif
\ No newline at end of file

diff --git a/qcsrc/dpdefs/keycodes.qc b/qcsrc/dpdefs/keycodes.qc
index 65fe815b0001bf47080a06c3d9cb0796355b0f4f..9ed47ec96f324fc576074defd06614fbb2cbf729 100644 (file)
--- a/qcsrc/dpdefs/keycodes.qc
+++ b/qcsrc/dpdefs/keycodes.qc
@@ -1,3 +1,11 @@
+#ifndef KEYCODES_H
+#define KEYCODES_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 ///////////////////////////
 // key constants
 
@@ -144,4 +152,4 @@ float K_MOUSE13             =       526;
 float K_MOUSE14                =       527;
 float K_MOUSE15                =       528;
 float K_MOUSE16                =       529;
-
+#endif
\ No newline at end of file

diff --git a/qcsrc/dpdefs/menudefs.qc b/qcsrc/dpdefs/menudefs.qc
index 98a8003f2e5c83fa659eee1fd409c46a7414f609..94ac814ae7019ec677fcfc0dfb60638482e6a7d9 100644 (file)
--- a/qcsrc/dpdefs/menudefs.qc
+++ b/qcsrc/dpdefs/menudefs.qc
@@ -1,3 +1,11 @@
+#ifndef MENUDEFS_H
+#define MENUDEFS_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 //////////////////////////////////////////////////////////
 // sys globals
 
@@ -563,3 +571,4 @@ string      getextresponse(void) = #624;
 const string cvar_string(string name) = #71;
 const string cvar_defstring(string name) = #89;
 float  stringwidth(string text, float handleColors, vector size) = #468;
+#endif
\ No newline at end of file

diff --git a/qcsrc/dpdefs/progsdefs.qc b/qcsrc/dpdefs/progsdefs.qc
index 210ad1b8d68a2967cf386dece0addc2a4db487dd..0064060a4b6ed135766a500aa0d226a2faa04317 100644 (file)
--- a/qcsrc/dpdefs/progsdefs.qc
+++ b/qcsrc/dpdefs/progsdefs.qc
@@ -1,3 +1,6 @@
+#ifndef PROGSDEFS_H
+#define PROGSDEFS_H
+
 /*
 ==============================================================================
 
@@ -502,3 +505,4 @@ void(entity e) setspawnparms                = #78;          // set parm1... to the
                                                                                                // for coop respawn
 
 //============================================================================
+#endif
\ No newline at end of file

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index c7499e58e40a8a94ba1f31f2c504f0310bb465a3..ee556ba00ecafe0b5b5be8c62d3faa0778c0c846 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+       #include "../../dpdefs/menudefs.qc"
+    #include "../../common/util.qh"
+    #include "../oo/base.qh"
+    #include "menu_cmd.qh"
+    #include "../menu.qh"
+#elif defined(SVQC)
+#endif
+
 string _dumptree_space;
 void _dumptree_open(entity pass, entity me)
 {

diff --git a/qcsrc/menu/command/menu_cmd.qh b/qcsrc/menu/command/menu_cmd.qh
index 7a18fe2def40683da35241f8b6bf53a04429d68d..c75d8e3c1b1b6d90d1e76d2c9dc5a69127de14d0 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qh
+++ b/qcsrc/menu/command/menu_cmd.qh
@@ -1 +1,33 @@
+#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.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #include "../sys-post.qh"
+    #include "../config.qh"
+    #include "../../warpzonelib/mathlib.qh"
+    #include "../../common/util.qh"
+    #include "../../common/test.qh"
+    #include "../oo/base.qh"
+    #include "../../common/playerstats.qh"
+    #include "../../common/teams.qh"
+    #include "../../common/constants.qh"
+    #include "../../common/mapinfo.qh"
+    #include "../../common/campaign_common.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "../../common/counting.qh"
+    #include "../../common/command/markup.qh"
+    #include "../../common/command/rpn.qh"
+    #include "../../common/command/generic.qh"
+    #include "../../common/command/shared_defs.qh"
+    #include "../../common/urllib.qh"
+    #include "../../common/monsters/monsters.qh"
+#elif defined(SVQC)
+#endif
+
 void GameCommand(string command);
+#endif
\ No newline at end of file

diff --git a/qcsrc/menu/config.qh b/qcsrc/menu/config.qh
index ceb266ac991cd0db1574e656bd485661400a9016..f2c4a9b4352416da19653926d81c707d90636ef7 100644 (file)
--- a/qcsrc/menu/config.qh
+++ b/qcsrc/menu/config.qh
@@ -1,3 +1,14 @@
-// build config file
-#define MENUQC // so common/*.qc can check for menu QC or game QC
+#ifndef CONFIG_H
+#define CONFIG_H
 
+#if defined(CSQC)
+#elif defined(MENUQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/menudefs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #include "sys-post.qh"
+#elif defined(SVQC)
+#endif
+
+#endif
\ No newline at end of file

diff --git a/qcsrc/menu/draw.qc b/qcsrc/menu/draw.qc
index ff9d9590d1864b89db9b7f33e7ef1dc86c1e700a..fa7c65c51cde498ef3ec7bdb03446345a32bb586 100644 (file)
--- a/qcsrc/menu/draw.qc
+++ b/qcsrc/menu/draw.qc
@@ -1,3 +1,8 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 string draw_mousepointer;
 vector draw_mousepointer_offset;
 vector draw_mousepointer_size;

diff --git a/qcsrc/menu/draw.qh b/qcsrc/menu/draw.qh
index 96e0233df3e43037f1c6d77b5e0828eede5c9109..95667434da10565e19be7562a169eec17f6b561d 100644 (file)
--- a/qcsrc/menu/draw.qh
+++ b/qcsrc/menu/draw.qh
@@ -1,3 +1,36 @@
+#ifndef DRAW_H
+#define DRAW_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/menudefs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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
@@ -38,3 +71,4 @@ vector globalToBoxSize(vector v, vector scale);
 
 float draw_TextWidth_WithColors(string s, vector size);
 float draw_TextWidth_WithoutColors(string s, vector size);
+#endif
\ No newline at end of file

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 94446bd3fb1acedce6b9b0c5a11d8a002cd4b3ac..ec19cb9e1f017275bd265ccc692178cd6669cdaa 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -1,3 +1,8 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 ///////////////////////////////////////////////
 // Menu Source File
 ///////////////////////

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index b6c0795a8544424d505b8392d8d7f4f7cec59825..bae23e4f783c381595cb31082ba9f74fdba572c6 100644 (file)
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -1,3 +1,35 @@
+#ifndef MENU_H
+#define MENU_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/menudefs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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)
@@ -38,3 +70,4 @@ void preMenuDraw(); // this is run before the menu is drawn. You may put some st
 void postMenuDraw(); // this is run just after the menu is drawn (or not). Useful to draw something over everything else.
 
 void m_sync();
+#endif
\ No newline at end of file

diff --git a/qcsrc/menu/oo/base.qh b/qcsrc/menu/oo/base.qh
index ed4eba5a12676d430314bd7c46a6d93603405405..72280a1d10e52ccee02c30fc03e6ab76c9b28b37 100644 (file)
--- a/qcsrc/menu/oo/base.qh
+++ b/qcsrc/menu/oo/base.qh
@@ -1,3 +1,20 @@
+#ifndef BASE_H
+#define BASE_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+       #include "../../common/util-pre.qh"
+    #include "../sys-pre.qh"
+    #include "../../dpdefs/menudefs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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;
@@ -25,3 +42,4 @@ entity spawnObject()
                Object_vtbl = spawnVtbl(e, null_entity);
        return e;
 }
+#endif
\ No newline at end of file

diff --git a/qcsrc/menu/oo/implementation.qh b/qcsrc/menu/oo/implementation.qh
index 28b7f08e4eff2ea0a5ad64e74ff532a8b3fa6b5c..b8073e6bae4eb53417f83d105613df4ccbba3e7e 100644 (file)
--- a/qcsrc/menu/oo/implementation.qh
+++ b/qcsrc/menu/oo/implementation.qh
@@ -1,3 +1,40 @@
+#ifndef IMPLEMENTATION_H
+#define IMPLEMENTATION_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+    #include "../../common/util-pre.qh"
+    #include "../sys-pre.qh"
+    #include "../../dpdefs/menudefs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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
@@ -26,3 +63,4 @@
 
 // for the implementation
 #define SUPER(cname) (cname##_vtbl.vtblbase)
+#endif
\ No newline at end of file

diff --git a/qcsrc/menu/oo/interface.qh b/qcsrc/menu/oo/interface.qh
index 1e122066c526349335a42505038e2f5bb64af766..8d25f5e37b5378f7649052aeb4804a982b17910d 100644 (file)
--- a/qcsrc/menu/oo/interface.qh
+++ b/qcsrc/menu/oo/interface.qh
@@ -1,3 +1,39 @@
+#ifndef INTERFACE_H
+#define INTERFACE_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+    #include "../../common/util-pre.qh"
+    #include "../sys-pre.qh"
+    #include "../../dpdefs/menudefs.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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
@@ -23,3 +59,4 @@
 #define ATTRIBARRAY(cname,name,type,cnt)   .type name[cnt];
 #define ENDCLASS(cname)                    .float instanceOf##cname;
 #define SUPER(cname)
+#endif
\ No newline at end of file

diff --git a/qcsrc/menu/skin.qh b/qcsrc/menu/skin.qh
index d44f6577efdec377597398e5b790ccb5ae91932c..87f5b4928626921a0b330fb22c77315d7d809d64 100644 (file)
--- a/qcsrc/menu/skin.qh
+++ b/qcsrc/menu/skin.qh
@@ -1,3 +1,37 @@
+#ifndef SKIN_H
+#define SKIN_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+    #include "../common/util-pre.qh"
+    #include "sys-pre.qh"
+    #include "../dpdefs/menudefs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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
@@ -24,3 +58,4 @@
 #undef SKINFLOAT
 #undef SKINVECTOR
 #undef SKINBEGIN
+#endif
\ No newline at end of file

diff --git a/qcsrc/menu/sys-post.qh b/qcsrc/menu/sys-post.qh
index e466fb482ab008961c9395c5389f7339025dc845..187459091c9c1484350563006a2a49ae3852eb3e 100644 (file)
--- a/qcsrc/menu/sys-post.qh
+++ b/qcsrc/menu/sys-post.qh
@@ -1 +1,14 @@
+#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.qc"
+    #include "../dpdefs/keycodes.qc"
+#elif defined(SVQC)
+#endif
+
 #pragma noref 0
+#endif
\ No newline at end of file

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

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 95a7439a6a44b9e036c5642f9d249558aa3b9946..f7e8a41a6020d397c737ff030664681bbe0207ac 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -1,3 +1,8 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 float GL_CheckExtension(string ext)
 {
        return (strstrofs(strcat(" ", cvar_string("gl_info_extensions"), " "), strcat(" ", ext, " "), 0) >= 0);

diff --git a/qcsrc/menu/xonotic/util.qh b/qcsrc/menu/xonotic/util.qh
index 33ecb8c4d4c984754975c1b3ea1d5a8267da1c77..aad853485fbc01960fb1844c26a6832f36779226 100644 (file)
--- a/qcsrc/menu/xonotic/util.qh
+++ b/qcsrc/menu/xonotic/util.qh
@@ -1,3 +1,37 @@
+#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.qc"
+    #include "../../dpdefs/keycodes.qc"
+    #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();
 
@@ -51,3 +85,4 @@ string _Nex_ExtResponseSystem_RecommendedServers;
 float _Nex_ExtResponseSystem_RecommendedServersNeedsRefresh;
 
 void CheckSendCvars(entity me, string cvarnamestring);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/anticheat.qc b/qcsrc/server/anticheat.qc
index 33c82913116b2b350ba1ff0ea1c3917a09da76df..a9d7fa8c8550564a776d84e78706f4b2b9232c24 100644 (file)
--- a/qcsrc/server/anticheat.qc
+++ b/qcsrc/server/anticheat.qc
@@ -1,3 +1,16 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../warpzonelib/mathlib.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "command/common.qh"
+    #include "anticheat.qh"
+#endif
+
 .float anticheat_jointime;
 
 void mean_accumulate(entity e, .float a, .float c, float mean, float value, float weight)

diff --git a/qcsrc/server/anticheat.qh b/qcsrc/server/anticheat.qh
index e46dcce7b2051a8af3e8e847975d76e41b5079f3..f256cf7dd9fa91efcd98224b755696c39420d6f7 100644 (file)
--- a/qcsrc/server/anticheat.qh
+++ b/qcsrc/server/anticheat.qh
@@ -1,3 +1,73 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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();
@@ -12,3 +82,4 @@ void anticheat_startframe();
 void anticheat_endframe();
 
 void anticheat_fixangle();
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index 5dfce75136a4dd118e8fe7d319d2b3e917b5adbe..dc20370eef957c75d7e5e268ebd65184ad9a29e1 100644 (file)
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -1,3 +1,12 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "vehicles/vehicles_def.qh"
+    #include "antilag.qh"
+#endif
+
 const float ANTILAG_MAX_ORIGINS = 64;
 .vector antilag_origins[ANTILAG_MAX_ORIGINS];
 .float antilag_times[ANTILAG_MAX_ORIGINS];

diff --git a/qcsrc/server/antilag.qh b/qcsrc/server/antilag.qh
index b89f12bb153ec852d01a6f8553af37644d2d1345..555547d371dc730b4bcd110d137948f65423bd46 100644 (file)
--- a/qcsrc/server/antilag.qh
+++ b/qcsrc/server/antilag.qh
@@ -1,3 +1,83 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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);
@@ -9,3 +89,4 @@ void antilag_clear(entity e);
 
 #define ANTILAG_LATENCY(e) min(0.4, e.ping * 0.001)
 // add one ticrate?
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 4ef4ee3796317da78f82d792777689d9db29bda7..760f6ddd4e4c0034074c81b7cfd49effcd1a8d8e 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1,3 +1,52 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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;
@@ -879,4 +928,4 @@ float autocvar_g_buffs_vampire_damage_steal;
 float autocvar_g_buffs_invisible_alpha;
 float autocvar_g_buffs_flight_gravity;
 float autocvar_g_buffs_jump_height;
-
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index d4737dba367b90926737177925accce73e62f245..b45455c8e7b6709653399ce5c7e10a63db10c113 100644 (file)
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -1,3 +1,27 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../sys-post.qh"
+    #include "../../warpzonelib/common.qh"
+    #include "../../warpzonelib/util_server.qh"
+    #include "../../common/constants.qh"
+    #include "../../common/teams.qh"
+    #include "../../common/util.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "../weapons/accuracy.qh"
+    #include "../t_items.qh"
+    #include "../autocvars.qh"
+    #include "../constants.qh"
+    #include "../defs.qh"
+    #include "../mutators/mutators_include.qh"
+    #include "../campaign.qh"
+    #include "../../common/mapinfo.qh"
+    #include "../../csqcmodellib/sv_model.qh"
+    #include "../antilag.qh"
+#endif
+
 #include "bot.qh"
 #include "aim.qh"
 #include "navigation.qh"

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index 72e580b56e74bce18b75e2687609ec3b3063160c..43a24ba99146bb434b41971dac09033b49388312 100644 (file)
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -1,3 +1,17 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "campaign.qh"
+    #include "../common/campaign_common.qh"
+    #include "../common/mapinfo.qh"
+    #include "cheats.qh"
+#endif
+
 // campaign cvars:
 //   _campaign_index: index of CURRENT map
 //   _campaign_name: name of the current campaign

diff --git a/qcsrc/server/campaign.qh b/qcsrc/server/campaign.qh
index 487deb9820af2fa049c42421cae4d8ad38317489..e80666bc9d648afe031c956cfbd27debd2eb0c61 100644 (file)
--- a/qcsrc/server/campaign.qh
+++ b/qcsrc/server/campaign.qh
@@ -1,3 +1,59 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
 
@@ -13,3 +69,4 @@ void CampaignLevelWarp(float n);
 float campaign_bots_may_start;
 // campaign mode: bots shall spawn but wait for the player to spawn before they do anything
 // in other game modes, this is ignored
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 28bb86cb85e9d8201233efde3af9fa6612944f77..716f4068dd1554de45a88af09b481505dd73fb87 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -1,3 +1,23 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../warpzonelib/anglestransform.qh"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "../common/monsters/monsters.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "weapons/tracing.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "../common/deathtypes.qh"
+    #include "mutators/mutators_include.qh"
+    #include "../csqcmodellib/sv_model.qh"
+    #include "cheats.qh"
+#endif
+
 void CopyBody(float keepvelocity);
 
 #ifdef NOCHEATS

diff --git a/qcsrc/server/cheats.qh b/qcsrc/server/cheats.qh
index 1f31addee398ef6bfd529706e7de914375ca468b..dde27e8923a93af60632e98e9e50aacbd34cb94d 100644 (file)
--- a/qcsrc/server/cheats.qh
+++ b/qcsrc/server/cheats.qh
@@ -1,3 +1,74 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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;
@@ -11,3 +82,4 @@ float CheatCommand(float argc);
 float CheatFrame();
 
 void Drag_MoveDrag(entity from, entity to); // call this from CopyBody
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 0974dae558dbe23047502fd958153e146646a10b..b85b7c020980f903b6303139c7429d0aa3beb7a3 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1,3 +1,43 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../warpzonelib/server.qh"
+    #include "../common/constants.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "../common/net_notice.qh"
+    #include "../common/monsters/monsters.qh"
+    #include "../common/monsters/sv_monsters.qh"
+    #include "../common/weapons/weapons.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 "vehicles/vehicles_def.qh"
+    #include "campaign.qh"
+    #include "../common/mapinfo.qh"
+    #include "command/common.qh"
+    #include "command/vote.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 "ipban.qh"
+    #include "race.qh"
+    #include "antilag.qh"
+    #include "playerdemo.qh"
+#endif
+
 void send_CSQC_teamnagger() {
        WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
        WriteByte(MSG_BROADCAST, TE_CSQC_TEAMNAGGER);

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index 3a9c8bb3ad9b11b2890a48148d49b42b0398fbe5..0345a53a8c8c8cc304097527a4f28043d766b962 100644 (file)
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -1,3 +1,20 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../common/constants.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "mutators/mutators_include.qh"
+    #include "vehicles/vehicles_def.qh"
+    #include "command/common.qh"
+    #include "../csqcmodellib/sv_model.qh"
+    #include "cheats.qh"
+    #include "round_handler.qh"
+#endif
+
 /*
  * Impulse map:
  *

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index c31550c58ae77952381355919f688e0b2f3d5fc7..3244f37afe04ee847bb2a3a341f37ffcbdd4a296 100644 (file)
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -1,3 +1,30 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../warpzonelib/mathlib.qh"
+    #include "../warpzonelib/server.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "../common/animdecide.qh"
+    #include "../common/monsters/sv_monsters.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "t_items.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "../common/notifications.qh"
+    #include "mutators/mutators_include.qh"
+    #include "../common/mapinfo.qh"
+    #include "../csqcmodellib/sv_model.qh"
+    #include "anticheat.qh"
+    #include "cheats.qh"
+    #include "g_hook.qh"
+    #include "race.qh"
+    #include "playerdemo.qh"
+#endif
+
 .float race_penalty;
 .float restart_jump;
 

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 89f9ca2c5965cafca1d58a24220c849a46512d17..32cd5f8db8cba3e64133861d2834a1d10ada5dce 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -1,3 +1,29 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../common/constants.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "../common/animdecide.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "weapons/accuracy.qh"
+    #include "t_items.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/deathtypes.qh"
+    #include "mutators/mutators_include.qh"
+    #include "../common/mapinfo.qh"
+    #include "command/common.qh"
+    #include "../csqcmodellib/sv_model.qh"
+    #include "cheats.qh"
+    #include "../common/playerstats.qh"
+    #include "portals.qh"
+#endif
+
 .entity pusher;
 .float pushltime;
 .float istypefrag;

diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc
index aaf8f5ef61c6d715a1ab66cfbd1ca2a78bbad1c6..984093e56c6e589270395263bc8262394726fa0b 100644 (file)
--- a/qcsrc/server/command/banning.qc
+++ b/qcsrc/server/command/banning.qc
@@ -1,3 +1,14 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/dpextensions.qc"
+    #include "../../common/util.qh"
+    #include "../../common/command/shared_defs.qh"
+    #include "../autocvars.qh"
+    #include "common.qh"
+    #include "banning.qh"
+    #include "../ipban.qh"
+#endif
 // =====================================================
 //  Banning and kicking command code, written by Samual
 //  Last updated: December 29th, 2011

diff --git a/qcsrc/server/command/banning.qh b/qcsrc/server/command/banning.qh
index 8c71af1793bcb92eab965927e6ce9d53813920ef..b49da6e814f10c07a75e4944bbaa70b4f9f10d91 100644 (file)
--- a/qcsrc/server/command/banning.qh
+++ b/qcsrc/server/command/banning.qh
@@ -1,3 +1,64 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -13,3 +74,4 @@ float Ban_Delete(float i);
 
 // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file
 void BanCommand_macro_write_aliases(float fh);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 29f46c9cd1a803a8470264ac92108b454d5c12fb..fed7088ad8474ad83f2e901652c9a59810b2c632 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -1,3 +1,32 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../warpzonelib/common.qh"
+    #include "../../common/constants.qh"
+    #include "../../common/teams.qh"
+    #include "../../common/util.qh"
+    #include "../../common/command/shared_defs.qh"
+    #include "../../common/monsters/monsters.qh"
+    #include "../../common/monsters/sv_monsters.qh"
+    #include "../../common/monsters/spawn.qh"
+    #include "../autocvars.qh"
+    #include "../defs.qh"
+    #include "../../common/notifications.qh"
+    #include "../../common/deathtypes.qh"
+    #include "../mutators/mutators_include.qh"
+    #include "../vehicles/vehicles_def.qh"
+    #include "../campaign.qh"
+    #include "../../common/mapinfo.qh"
+    #include "common.qh"
+    #include "vote.qh"
+    #include "cmd.qh"
+    #include "../cheats.qh"
+    #include "../scores.qh"
+    #include "../ipban.qh"
+#endif
+
 // =========================================================
 //  Server side networked commands code, reworked by Samual
 //  Last updated: December 28th, 2011

diff --git a/qcsrc/server/command/cmd.qh b/qcsrc/server/command/cmd.qh
index 120bf3e02ebfd3a4ab0154490d5d2114d8b60ae4..e995dd8f4ab19ee6fc514fb1b9e5c698370eb497 100644 (file)
--- a/qcsrc/server/command/cmd.qh
+++ b/qcsrc/server/command/cmd.qh
@@ -1,3 +1,68 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -15,3 +80,4 @@ string MapVote_Suggest(string m);
 
 // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file
 void ClientCommand_macro_write_aliases(float fh);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index 323d232c799717f79654caaeaca8eedd03b57fc8..e52d8fc14ed3d541f06c8181d7ff630574a3a084 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -1,3 +1,20 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../sys-post.qh"
+    #include "../../common/util.qh"
+    #include "../../common/counting.qh"
+    #include "../../common/command/shared_defs.qh"
+    #include "../autocvars.qh"
+    #include "../defs.qh"
+    #include "../../common/notifications.qh"
+    #include "common.qh"
+    #include "vote.qh"
+    #include "../scores.qh"
+#endif
+
 // ====================================================
 //  Shared code for server commands, written by Samual
 //  Last updated: December 27th, 2011

diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh
index 13b260dbd0d8e77f98c25f87f3a3f6203ff642f0..9961e0e01028f6c436784dca9fc9f682a4fe2d80 100644 (file)
--- a/qcsrc/server/command/common.qh
+++ b/qcsrc/server/command/common.qh
@@ -1,3 +1,63 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -35,4 +95,5 @@ void timeout_handler_think();
 void CommonCommand_macro_write_aliases(float fh);
 
 // keep track of the next token to use for argc
-float next_token;
\ No newline at end of file
+float next_token;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc
index dd57b2645f806ac9f672d5879175b9770482eace..a3290e1e1b363bdd5305c442e6c96db4e8556dbc 100644 (file)
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -1,3 +1,19 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
+
 // =========================================================
 //  Reply messages for common commands, re-worked by Samual
 //  Last updated: December 30th, 2011

diff --git a/qcsrc/server/command/getreplies.qh b/qcsrc/server/command/getreplies.qh
index d2b1395e8952479ac99da860dd1ee11928b51119..7a22e86c059965b087630faa719f07b7ac9e2175 100644 (file)
--- a/qcsrc/server/command/getreplies.qh
+++ b/qcsrc/server/command/getreplies.qh
@@ -1,3 +1,22 @@
+#ifndef GETREPLIES_H
+#define GETREPLIES_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -18,3 +37,4 @@ string getladder(void);
 string getmaplist(void);
 string getlsmaps(void);
 string getmonsterlist(void);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index 9c644bfc559c3f76496fb4ed2923eab9a571d817..7214b7ea5f58440209e8a6f2d93f2b0c647927c9 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -1,3 +1,14 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../common/util.qh"
+    #include "../defs.qh"
+    #include "radarmap.qh"
+    #include "../../csqcmodellib/sv_model.qh"
+#endif
+
 // ===============================================
 //     Generates radar map images for use in the HUD
 // ===============================================

diff --git a/qcsrc/server/command/radarmap.qh b/qcsrc/server/command/radarmap.qh
index 706de70722d306c707ec6015c57e25fdf26fe581..e4fe3c47c9976339e0f4fabf7880aa66755541cf 100644 (file)
--- a/qcsrc/server/command/radarmap.qh
+++ b/qcsrc/server/command/radarmap.qh
@@ -1,3 +1,65 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
 // ===========================================
@@ -11,3 +73,4 @@ float sharpen_buffer[RADAR_WIDTH_MAX * 3];
 string doublehex = "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFFFF";
 // FF is contained twice, to map 256 to FF too
 // removes the need to bound()
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 63485d59c69a88081932cbbee6d5eb546010c289..7ffd1b924f3799b7a8e15a8adc531e686ae13f27 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1,3 +1,27 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../sys-post.qh"
+    #include "../../warpzonelib/mathlib.qh"
+    #include "../../common/constants.qh"
+    #include "../../common/teams.qh"
+    #include "../../common/util.qh"
+    #include "../../common/command/shared_defs.qh"
+    #include "../../common/monsters/sv_monsters.qh"
+    #include "../autocvars.qh"
+    #include "../defs.qh"
+    #include "../../common/notifications.qh"
+    #include "../mutators/mutators_include.qh"
+    #include "../../common/mapinfo.qh"
+    #include "common.qh"
+    #include "cmd.qh"
+    #include "sv_cmd.qh"
+    #include "../anticheat.qh"
+    #include "../playerdemo.qh"
+#endif
+
 // =====================================================
 //  Server side game commands code, reworked by Samual
 //  Last updated: December 29th, 2011

diff --git a/qcsrc/server/command/sv_cmd.qh b/qcsrc/server/command/sv_cmd.qh
index 4b8c946a2e159f76b7b36faee83cf088a88ca908..c28fae6a4c027c132dde2216f99262462b8327a7 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qh
+++ b/qcsrc/server/command/sv_cmd.qh
@@ -1,3 +1,69 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -13,4 +79,5 @@ float shuffleteams_players[SHUFFLETEAMS_MAX_PLAYERS]; // maximum of 255 player s
 float shuffleteams_teams[SHUFFLETEAMS_MAX_TEAMS]; // maximum of 4 teams
 
 // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file
-void GameCommand_macro_write_aliases(float fh);
\ No newline at end of file
+void GameCommand_macro_write_aliases(float fh);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 79925fc4e58070dbe09837256ba2b45bea554808..d1cc5c50cbc704b7f02a8f10f66e22f533a07406 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -1,3 +1,26 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
+
 // =============================================
 //  Server side voting code, reworked by Samual
 //  Last updated: December 27th, 2011

diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh
index 36da806196ccef8a25789573292d2d5f63e56d79..cd34fa2f638f8284e96854cfc5b76dd65eba4568 100644 (file)
--- a/qcsrc/server/command/vote.qh
+++ b/qcsrc/server/command/vote.qh
@@ -1,3 +1,29 @@
+#ifndef VOTE_H
+#define VOTE_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -48,4 +74,5 @@ float readyrestart_happened; // keeps track of whether a restart has already hap
 float restart_mapalreadyrestarted; // bool, indicates whether reset_map() was already executed
 .float ready; // flag for if a player is ready
 void reset_map(float dorespawn);
-void ReadyCount();
\ No newline at end of file
+void ReadyCount();
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/constants.qh b/qcsrc/server/constants.qh
index ada2acd1adf3a183c76aed99298521e4711a8b83..1f40027fb608f4c05eff5eb04951f65b38b8ef31 100644 (file)
--- a/qcsrc/server/constants.qh
+++ b/qcsrc/server/constants.qh
@@ -1,3 +1,53 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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;
@@ -21,3 +71,4 @@ const float NUM_PLAYERSKINS_TEAMPLAY = 3;
 const float ASSAULT_VALUE_INACTIVE = 1000;
 
 const float DOOR_NOSPLASH = 256; // generic anti-splashdamage spawnflag
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/csqceffects.qc b/qcsrc/server/csqceffects.qc
index 82ae491333b17ca98f31943e238754055344ce9c..21d9f077c2a1adb171804b3b5ebd89d8aba84428 100644 (file)
--- a/qcsrc/server/csqceffects.qc
+++ b/qcsrc/server/csqceffects.qc
@@ -1,3 +1,10 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../common/constants.qh"
+#endif
+
 void te_csqc_lightningarc(vector from,vector to)
 {
        WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index e4184e284ee0d441c4cd87014eb1793f6eb53d83..be8a6a84bc6e66b46308e33688a80bcd738c133d 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -1,3 +1,54 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
@@ -618,3 +669,4 @@ const int MIF_GUIDED_TAG = 128;
 .string playernick;
 .float elos;
 .float ranks;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/ent_cs.qc b/qcsrc/server/ent_cs.qc
index b6db8dd3c358eb260eccec10b49cf0e316559227..f63ca3de224d4daa12abde61b9e215aecde22a37 100644 (file)
--- a/qcsrc/server/ent_cs.qc
+++ b/qcsrc/server/ent_cs.qc
@@ -1,3 +1,14 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../common/constants.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "mutators/mutators_include.qh"
+#endif
+
 /**
  * The point of these entities is to avoid the problems
  * with clientprediction.

diff --git a/qcsrc/server/func_breakable.qc b/qcsrc/server/func_breakable.qc
index d117cbfe6f107d873af925d498152ab60a825590..206df5d5b99dbbae79a29b6d12861d1954dd14bb 100644 (file)
--- a/qcsrc/server/func_breakable.qc
+++ b/qcsrc/server/func_breakable.qc
@@ -1,3 +1,19 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "../common/monsters/monsters.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/deathtypes.qh"
+    #include "mutators/mutators_include.qh"
+    #include "../csqcmodellib/sv_model.qh"
+#endif
+
 .entity sprite;
 
 .float dmg;

diff --git a/qcsrc/server/g_casings.qc b/qcsrc/server/g_casings.qc
index 2ef04be17cf98ec2f1078db85cbc3959e4e84fa6..e43d66fdc3c51ef9d3c108b643f9490e5e885ff4 100644 (file)
--- a/qcsrc/server/g_casings.qc
+++ b/qcsrc/server/g_casings.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+#endif
+
 float Casing_SendEntity(entity to, float sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_CASING);

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 0e35b0f7458f587482c7154b7f291e4ca9abd3df..5f8f44964f967584d8afc6bddf6da40b3b0a2dbc 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -1,3 +1,33 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../warpzonelib/common.qh"
+    #include "../common/constants.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "weapons/accuracy.qh"
+    #include "weapons/csqcprojectile.qh"
+    #include "weapons/selection.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 "../csqcmodellib/sv_model.qh"
+    #include "../common/playerstats.qh"
+    #include "g_hook.qh"
+    #include "scores.qh"
+    #include "spawnpoints.qh"
+#endif
+
 .float dmg;
 .float dmg_edge;
 .float dmg_force;

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index f77cf56e3ccbc640755c17d1d875dd10f7281890..275e7ee8de7eaf6463ed51369287e104297b3846 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -1,3 +1,22 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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 Xonotic Grappling Hook

diff --git a/qcsrc/server/g_hook.qh b/qcsrc/server/g_hook.qh
index 2904c3230010db8ec0cde840d63cc9595e2b66e5..10a5476c6c4090e69bd81bf045995cbb7346ee75 100644 (file)
--- a/qcsrc/server/g_hook.qh
+++ b/qcsrc/server/g_hook.qh
@@ -1,3 +1,25 @@
+#ifndef HOOK_H
+#define HOOK_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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();
@@ -15,3 +37,4 @@ const float HOOK_WAITING_FOR_RELEASE = 16;
 
 void GrappleHookInit();
 vector hook_shotorigin[4];
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index 3916d2b513506d09339a0b300c44b9b0b97eb1f8..3e214d540b8d6d347d46377f00458a61e9c4a3c3 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../common/constants.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../csqcmodellib/sv_model.qh"
+#endif
+
 .float modelscale;
 
 void g_model_setcolormaptoactivator (void)

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index 94856c9c4fbd882d29562f8a91e52a6474866be4..558243aa60342e19814f3f6ba825b43b077227c9 100644 (file)
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -1,3 +1,17 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../warpzonelib/common.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "command/common.qh"
+    #include "../csqcmodellib/sv_model.qh"
+    #include "antilag.qh"
+#endif
+
 void SUB_NullThink(void) { }
 
 void()  SUB_CalcMoveDone;

diff --git a/qcsrc/server/g_tetris.qc b/qcsrc/server/g_tetris.qc
index 00daebf635f7dfc999e44da46306064e631d437a..212e4a10dc422d5bdfa54aaf66b79db93f71b3a3 100644 (file)
--- a/qcsrc/server/g_tetris.qc
+++ b/qcsrc/server/g_tetris.qc
@@ -1,3 +1,11 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "autocvars.qh"
+#endif
+
 /*
 
 Installation:

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 0af8737b4f3029bc90602277c1c6b186c9bac9bf..cacb434d3d76cd00e04d8e0728272b7b68349eca 100644 (file)
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -1,3 +1,22 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "../common/monsters/monsters.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "weapons/csqcprojectile.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/notifications.qh"
+    #include "../common/deathtypes.qh"
+    #include "../common/mapinfo.qh"
+#endif
+
 void SUB_DontUseTargets()
 {
 }

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index 0f3e885ded43d41f93b8212f07c381a154b077c4..906f27e1107ceba98b07198363b157813ada706d 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/mapinfo.qh"
+#endif
+
 float Violence_GibSplash_SendEntity(entity to, float sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_GIBSPLASH);

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 08681c980ce3a68746e377874ac8575eb27a6f9a..c62fee03d686ecf0e7b5a0d6b23b8c2657feb0e3 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1,3 +1,39 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../common/constants.qh"
+    #include "../common/stats.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "../common/monsters/sv_monsters.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "weapons/weaponstats.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/notifications.qh"
+    #include "mutators/mutators_include.qh"
+    #include "campaign.qh"
+    #include "../common/mapinfo.qh"
+    #include "command/common.qh"
+    #include "command/vote.qh"
+    #include "command/getreplies.qh"
+    #include "command/sv_cmd.qh"
+    #include "anticheat.qh"
+    #include "cheats.qh"
+    #include "../common/playerstats.qh"
+    #include "g_hook.qh"
+    #include "scores.qh"
+    #include "mapvoting.qh"
+    #include "ipban.qh"
+    #include "race.qh"
+    #include "antilag.qh"
+    #include "secret.qh"
+#endif
+
 const float LATENCY_THINKRATE = 10;
 .float latency_sum;
 .float latency_cnt;

diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc
index 2c9fa4bcd6164d756094c698e87e2213aedc3e74..1a7d1ff4506e92f6cd6ae58f47a7f280c89c5608 100644 (file)
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@ -1,3 +1,17 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "command/banning.qh"
+    #include "ipban.qh"
+#endif
+
 /*
  * Protocol of online ban list:
  *

diff --git a/qcsrc/server/ipban.qh b/qcsrc/server/ipban.qh
index d466942e31ed318bd052e5407616ba9a0c90c326..afa23e86a5e5e5a07ee658dc896b089e87fd94a6 100644 (file)
--- a/qcsrc/server/ipban.qh
+++ b/qcsrc/server/ipban.qh
@@ -1,3 +1,81 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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);
@@ -5,3 +83,4 @@ float Ban_MaybeEnforceBanOnce(entity client);
 float BanCommand(string command);
 
 void OnlineBanList_URI_Get_Callback(float id, float status, string data);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc
index 994e6a6f18a1b7809a57672a46376710f1d3cf2d..0963a294a1eb867272a9e2e0ea3315866a5339a7 100644 (file)
--- a/qcsrc/server/item_key.qc
+++ b/qcsrc/server/item_key.qc
@@ -1,3 +1,16 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/util.qh"
+    #include "../common/monsters/monsters.qh"
+    #include "defs.qh"
+    #include "../common/notifications.qh"
+    #include "item_key.qh"
+#endif
+
 /*
 TODO:
 - add an unlock sound (here to trigger_keylock and to func_door)

diff --git a/qcsrc/server/item_key.qh b/qcsrc/server/item_key.qh
index 99b2b1d5c3579134b638f10896f1a6dd392146cf..b45562efc88ad852913baf310dfe823902b027e2 100644 (file)
--- a/qcsrc/server/item_key.qh
+++ b/qcsrc/server/item_key.qh
@@ -1,3 +1,86 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
  */
@@ -20,4 +103,4 @@ float item_keys_usekey(entity l, entity p);
  * Returns a string with a comma separated list of key names, as specified in keylist.
  */
 string item_keys_keylist(float keylist);
-
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index a85415ff82d8d01de352da9488da4939b8f7e554..47ef2d1829fe99ddc60d3139cfc36ed2fb21a8a4 100644 (file)
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -1,4 +1,22 @@
-float GameTypeVote_AvailabilityStatus(string gtname) 
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/mapinfo.qh"
+    #include "command/getreplies.qh"
+    #include "command/cmd.qh"
+    #include "../common/playerstats.qh"
+    #include "mapvoting.qh"
+#endif
+
+float GameTypeVote_AvailabilityStatus(string gtname)
 { 
        float type = MapInfo_Type_FromString(gtname);
        if( type == 0 )

diff --git a/qcsrc/server/mapvoting.qh b/qcsrc/server/mapvoting.qh
index 72c519c845afafd2680b5ed5e880ce7fb28f684b..e79bdea2864ff55c9f3f589250b5525c7aebdf0d 100644 (file)
--- a/qcsrc/server/mapvoting.qh
+++ b/qcsrc/server/mapvoting.qh
@@ -1,3 +1,80 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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();
@@ -36,3 +113,4 @@ float mapvote_abstain;
 .float mapvote;
 
 entity mapvote_ent;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 3a150b58d2a2b83cd0cde0fc713d92aaf5b20fbb..1577acc13e92fc4f0c6201b6c41af45242c66b73 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1,9 +1,36 @@
-var void remove(entity e);
-void objerror(string s);
-void droptofloor();
-.vector dropped_origin;
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "miscfunctions.qh"
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../common/playerstats.qh"
+    #include "../warpzonelib/anglestransform.qh"
+    #include "../warpzonelib/server.qh"
+    #include "../common/constants.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "../common/urllib.qh"
+    #include "../common/command/generic.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "weapons/accuracy.qh"
+    #include "weapons/csqcprojectile.qh"
+    #include "weapons/selection.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 "../common/mapinfo.qh"
+    #include "command/common.qh"
+    #include "../csqcmodellib/sv_model.qh"
+    #include "ipban.qh"
+#endif
 
-void traceline_antilag (entity source, vector v1, vector v2, float nomonst, entity forent, float lag);
 void crosshair_trace(entity pl)
 {
        traceline_antilag(pl, pl.cursor_trace_start, pl.cursor_trace_start + normalize(pl.cursor_trace_endpos - pl.cursor_trace_start) * MAX_SHOT_DISTANCE, MOVE_NORMAL, pl, ANTILAG_LATENCY(pl));
@@ -23,15 +50,11 @@ void crosshair_trace_plusvisibletriggers(entity pl)
        for (e = first; e; e = e.chain)
                e.solid = SOLID_TRIGGER;
 }
-void WarpZone_traceline_antilag (entity source, vector v1, vector v2, float nomonst, entity forent, float lag);
 void WarpZone_crosshair_trace(entity pl)
 {
        WarpZone_traceline_antilag(pl, pl.cursor_trace_start, pl.cursor_trace_start + normalize(pl.cursor_trace_endpos - pl.cursor_trace_start) * MAX_SHOT_DISTANCE, MOVE_NORMAL, pl, ANTILAG_LATENCY(pl));
 }
 
-void() spawnfunc_info_player_deathmatch; // needed for the other spawnpoints
-void() spawnpoint_use;
-string GetMapname();
 
 string admin_name(void)
 {
@@ -41,8 +64,6 @@ string admin_name(void)
                return "SERVER ADMIN";
 }
 
-float DistributeEvenly_amount;
-float DistributeEvenly_totalweight;
 void DistributeEvenly_Init(float amount, float totalweight)
 {
     if (DistributeEvenly_amount)
@@ -77,37 +98,6 @@ float DistributeEvenly_GetRandomized(float weight)
     return f;
 }
 
-#define move_out_of_solid(e) WarpZoneLib_MoveOutOfSolid(e)
-
-const string STR_PLAYER = "player";
-const string STR_SPECTATOR = "spectator";
-const string STR_OBSERVER = "observer";
-
-#define IS_PLAYER(v)                   (v.classname == STR_PLAYER)
-#define IS_SPEC(v)                             (v.classname == STR_SPECTATOR)
-#define IS_OBSERVER(v)                         (v.classname == STR_OBSERVER)
-#define IS_CLIENT(v)                   (v.flags & FL_CLIENT)
-#define IS_BOT_CLIENT(v)               (clienttype(v) == CLIENTTYPE_BOT)
-#define IS_REAL_CLIENT(v)              (clienttype(v) == CLIENTTYPE_REAL)
-#define IS_NOT_A_CLIENT(v)             (clienttype(v) == CLIENTTYPE_NOTACLIENT)
-
-#define FOR_EACH_CLIENTSLOT(v) for(v = world; (v = nextent(v)) && (num_for_edict(v) <= maxclients); )
-#define FOR_EACH_CLIENT(v) FOR_EACH_CLIENTSLOT(v) if(IS_CLIENT(v))
-#define FOR_EACH_REALCLIENT(v) FOR_EACH_CLIENT(v) if(IS_REAL_CLIENT(v))
-
-#define FOR_EACH_PLAYER(v) FOR_EACH_CLIENT(v) if(IS_PLAYER(v))
-#define FOR_EACH_SPEC(v) FOR_EACH_CLIENT(v) if (!IS_PLAYER(v)) // Samual: shouldn't this be IS_SPEC(v)? and rather create a separate macro to include observers too
-#define FOR_EACH_REALPLAYER(v) FOR_EACH_REALCLIENT(v) if(IS_PLAYER(v))
-
-#define FOR_EACH_MONSTER(v) for(v = world; (v = findflags(v, flags, FL_MONSTER)) != world; )
-
-#define CENTER_OR_VIEWOFS(ent) (ent.origin + (IS_PLAYER(ent) ? ent.view_ofs : ((ent.mins + ent.maxs) * 0.5)))
-
-// copies a string to a tempstring (so one can strunzone it)
-string strcat1(string s) = #115; // FRIK_FILE
-
-float logfile_open;
-float logfile;
 
 void GameLogEcho(string s)
 {
@@ -157,32 +147,6 @@ void GameLogClose()
     }
 }
 
-#define strstr strstrofs
-/*
-// NOTE: DO NOT USE THIS FUNCTION TOO OFTEN.
-// IT WILL MOST PROBABLY DESTROY _ALL_ OTHER TEMP
-// STRINGS AND TAKE QUITE LONG. haystack and needle MUST
-// BE CONSTANT OR strzoneD!
-float strstr(string haystack, string needle, float offset)
-{
-       float len, endpos;
-       string found;
-       len = strlen(needle);
-       endpos = strlen(haystack) - len;
-       while(offset <= endpos)
-       {
-               found = substring(haystack, offset, len);
-               if(found == needle)
-                       return offset;
-               offset = offset + 1;
-       }
-       return -1;
-}
-*/
-
-const float NUM_NEAREST_ENTITIES = 4;
-entity nearest_entity[NUM_NEAREST_ENTITIES];
-float nearest_length[NUM_NEAREST_ENTITIES];
 entity findnearest(vector point, .string field, string value, vector axismod)
 {
     entity localhead;
@@ -554,494 +518,7 @@ vector randompos(vector m1, vector m2)
     return  v;
 }
 
-//#NO AUTOCVARS START
-
-float g_pickup_shells;
-float g_pickup_shells_max;
-float g_pickup_nails;
-float g_pickup_nails_max;
-float g_pickup_rockets;
-float g_pickup_rockets_max;
-float g_pickup_cells;
-float g_pickup_cells_max;
-float g_pickup_plasma;
-float g_pickup_plasma_max;
-float g_pickup_fuel;
-float g_pickup_fuel_jetpack;
-float g_pickup_fuel_max;
-float g_pickup_armorsmall;
-float g_pickup_armorsmall_max;
-float g_pickup_armorsmall_anyway;
-float g_pickup_armormedium;
-float g_pickup_armormedium_max;
-float g_pickup_armormedium_anyway;
-float g_pickup_armorbig;
-float g_pickup_armorbig_max;
-float g_pickup_armorbig_anyway;
-float g_pickup_armorlarge;
-float g_pickup_armorlarge_max;
-float g_pickup_armorlarge_anyway;
-float g_pickup_healthsmall;
-float g_pickup_healthsmall_max;
-float g_pickup_healthsmall_anyway;
-float g_pickup_healthmedium;
-float g_pickup_healthmedium_max;
-float g_pickup_healthmedium_anyway;
-float g_pickup_healthlarge;
-float g_pickup_healthlarge_max;
-float g_pickup_healthlarge_anyway;
-float g_pickup_healthmega;
-float g_pickup_healthmega_max;
-float g_pickup_healthmega_anyway;
-float g_pickup_ammo_anyway;
-float g_pickup_weapons_anyway;
-float g_weaponarena;
-WepSet g_weaponarena_weapons;
-float g_weaponarena_random;
-float g_weaponarena_random_with_blaster;
-string g_weaponarena_list;
-float g_weaponspeedfactor;
-float g_weaponratefactor;
-float g_weapondamagefactor;
-float g_weaponforcefactor;
-float g_weaponspreadfactor;
-
-WepSet start_weapons;
-WepSet start_weapons_default;
-WepSet start_weapons_defaultmask;
-float start_items;
-float start_ammo_shells;
-float start_ammo_nails;
-float start_ammo_rockets;
-float start_ammo_cells;
-float start_ammo_plasma;
-float start_ammo_fuel;
-float start_health;
-float start_armorvalue;
-WepSet warmup_start_weapons;
-WepSet warmup_start_weapons_default;
-WepSet warmup_start_weapons_defaultmask;
-#define WARMUP_START_WEAPONS ((g_warmup_allguns == 1) ? (warmup_start_weapons & (weaponsInMap | start_weapons)) : warmup_start_weapons)
-float warmup_start_ammo_shells;
-float warmup_start_ammo_nails;
-float warmup_start_ammo_rockets;
-float warmup_start_ammo_cells;
-float warmup_start_ammo_plasma;
-float warmup_start_ammo_fuel;
-float warmup_start_health;
-float warmup_start_armorvalue;
-float g_weapon_stay;
-
-float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still needs done? 
-{
-       float i = weaponinfo.weapon;
-       float d = 0;
-
-       if (!i)
-               return 0;
-
-       if (g_lms || g_ca || allguns)
-       {
-               if(weaponinfo.spawnflags & WEP_FLAG_NORMAL)
-                       d = true;
-               else
-                       d = false;
-       }
-       else if (g_cts)
-               d = (i == WEP_SHOTGUN);
-       else if (g_nexball)
-               d = 0; // weapon is set a few lines later
-       else
-               d = !(!weaponinfo.weaponstart);
-
-       if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
-               d |= (i == WEP_HOOK);
-       if(!g_cts && (weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED)) // never default mutator blocked guns
-               d = 0;
-
-       float t = weaponinfo.weaponstartoverride;
-
-       //print(strcat("want_weapon: ", weaponinfo.netname, " - d: ", ftos(d), ", t: ", ftos(t), ". \n"));
-
-       // bit order in t:
-       // 1: want or not
-       // 2: is default?
-       // 4: is set by default?
-       if(t < 0)
-               t = 4 | (3 * d);
-       else
-               t |= (2 * d);
-
-       return t;
-}
-
-void readplayerstartcvars()
-{
-       entity e;
-       float i, j, t;
-       string s;
-
-       // initialize starting values for players
-       start_weapons = '0 0 0';
-       start_weapons_default = '0 0 0';
-       start_weapons_defaultmask = '0 0 0';
-       start_items = 0;
-       start_ammo_shells = 0;
-       start_ammo_nails = 0;
-       start_ammo_rockets = 0;
-       start_ammo_cells = 0;
-       start_ammo_plasma = 0;
-       start_health = cvar("g_balance_health_start");
-       start_armorvalue = cvar("g_balance_armor_start");
-
-       g_weaponarena = 0;
-       g_weaponarena_weapons = '0 0 0';
-
-       s = cvar_string("g_weaponarena");
-       if (s == "0" || s == "")
-       {
-               if(g_ca)
-                       s = "most";
-       }
-
-       if (s == "0" || s == "")
-       {
-               // no arena
-       }
-       else if (s == "off")
-       {
-               // forcibly turn off weaponarena
-       }
-       else if (s == "all" || s == "1")
-       {
-               g_weaponarena = 1;
-               g_weaponarena_list = "All Weapons";
-               for (j = WEP_FIRST; j <= WEP_LAST; ++j)
-               {
-                       e = get_weaponinfo(j);
-                       if (!(e.spawnflags & WEP_FLAG_MUTATORBLOCKED))
-                               g_weaponarena_weapons |= WepSet_FromWeapon(j);
-               }
-       }
-       else if (s == "most")
-       {
-               g_weaponarena = 1;
-               g_weaponarena_list = "Most Weapons";
-               for (j = WEP_FIRST; j <= WEP_LAST; ++j)
-               {
-                       e = get_weaponinfo(j);
-                       if (!(e.spawnflags & WEP_FLAG_MUTATORBLOCKED))
-                               if (e.spawnflags & WEP_FLAG_NORMAL)
-                                       g_weaponarena_weapons |= WepSet_FromWeapon(j);
-               }
-       }
-       else if (s == "none")
-       {
-               g_weaponarena = 1;
-               g_weaponarena_list = "No Weapons";
-       }
-       else
-       {
-               g_weaponarena = 1;
-               t = tokenize_console(s);
-               g_weaponarena_list = "";
-               for (i = 0; i < t; ++i)
-               {
-                       s = argv(i);
-                       for (j = WEP_FIRST; j <= WEP_LAST; ++j)
-                       {
-                               e = get_weaponinfo(j);
-                               if (e.netname == s)
-                               {
-                                       g_weaponarena_weapons |= WepSet_FromWeapon(j);
-                                       g_weaponarena_list = strcat(g_weaponarena_list, e.message, " & ");
-                                       break;
-                               }
-                       }
-                       if (j > WEP_LAST)
-                       {
-                               print("The weapon mutator list contains an unknown weapon ", s, ". Skipped.\n");
-                       }
-               }
-               g_weaponarena_list = strzone(substring(g_weaponarena_list, 0, strlen(g_weaponarena_list) - 3));
-       }
-
-       if(g_weaponarena)
-               g_weaponarena_random = cvar("g_weaponarena_random");
-       else
-               g_weaponarena_random = 0;
-       g_weaponarena_random_with_blaster = cvar("g_weaponarena_random_with_blaster");
-
-       if (g_weaponarena)
-       {
-               g_weapon_stay = 0; // incompatible
-               start_weapons = g_weaponarena_weapons;
-               start_items |= IT_UNLIMITED_AMMO;
-       }
-       else
-       {
-               for (i = WEP_FIRST; i <= WEP_LAST; ++i)
-               {
-                       e = get_weaponinfo(i);
-                       float w = want_weapon(e, false);
-                       if(w & 1)
-                               start_weapons |= WepSet_FromWeapon(i);
-                       if(w & 2)
-                               start_weapons_default |= WepSet_FromWeapon(i);
-                       if(w & 4)
-                               start_weapons_defaultmask |= WepSet_FromWeapon(i);
-               }
-       }
-
-       if(!cvar("g_use_ammunition"))
-               start_items |= IT_UNLIMITED_AMMO;
 
-       if(start_items & IT_UNLIMITED_WEAPON_AMMO)
-       {
-               start_ammo_shells = 999;
-               start_ammo_nails = 999;
-               start_ammo_rockets = 999;
-               start_ammo_cells = 999;
-               start_ammo_plasma = 999;
-               start_ammo_fuel = 999;
-       }
-       else
-       {
-               start_ammo_shells = cvar("g_start_ammo_shells");
-               start_ammo_nails = cvar("g_start_ammo_nails");
-               start_ammo_rockets = cvar("g_start_ammo_rockets");
-               start_ammo_cells = cvar("g_start_ammo_cells");
-               start_ammo_plasma = cvar("g_start_ammo_plasma");
-               start_ammo_fuel = cvar("g_start_ammo_fuel");
-       }
-
-       if (warmup_stage)
-       {
-               warmup_start_ammo_shells = start_ammo_shells;
-               warmup_start_ammo_nails = start_ammo_nails;
-               warmup_start_ammo_rockets = start_ammo_rockets;
-               warmup_start_ammo_cells = start_ammo_cells;
-               warmup_start_ammo_plasma = start_ammo_plasma;
-               warmup_start_ammo_fuel = start_ammo_fuel;
-               warmup_start_health = start_health;
-               warmup_start_armorvalue = start_armorvalue;
-               warmup_start_weapons = start_weapons;
-               warmup_start_weapons_default = start_weapons_default;
-               warmup_start_weapons_defaultmask = start_weapons_defaultmask;
-
-               if (!g_weaponarena && !g_ca)
-               {
-                       warmup_start_ammo_shells = cvar("g_warmup_start_ammo_shells");
-                       warmup_start_ammo_nails = cvar("g_warmup_start_ammo_nails");
-                       warmup_start_ammo_rockets = cvar("g_warmup_start_ammo_rockets");
-                       warmup_start_ammo_cells = cvar("g_warmup_start_ammo_cells");
-                       warmup_start_ammo_plasma = cvar("g_warmup_start_ammo_plasma");
-                       warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
-                       warmup_start_health = cvar("g_warmup_start_health");
-                       warmup_start_armorvalue = cvar("g_warmup_start_armor");
-                       warmup_start_weapons = '0 0 0';
-                       warmup_start_weapons_default = '0 0 0';
-                       warmup_start_weapons_defaultmask = '0 0 0';
-                       for (i = WEP_FIRST; i <= WEP_LAST; ++i)
-                       {
-                               e = get_weaponinfo(i);
-                               float w = want_weapon(e, g_warmup_allguns);
-                               if(w & 1)
-                                       warmup_start_weapons |= WepSet_FromWeapon(i);
-                               if(w & 2)
-                                       warmup_start_weapons_default |= WepSet_FromWeapon(i);
-                               if(w & 4)
-                                       warmup_start_weapons_defaultmask |= WepSet_FromWeapon(i);
-                       }
-               }
-       }
-
-       if (g_jetpack)
-               start_items |= IT_JETPACK;
-
-       MUTATOR_CALLHOOK(SetStartItems);
-
-       if ((start_items & IT_JETPACK) || (g_grappling_hook && (start_weapons & WEPSET_HOOK)))
-       {
-               start_items |= IT_FUEL_REGEN;
-               start_ammo_fuel = max(start_ammo_fuel, cvar("g_balance_fuel_rotstable"));
-               warmup_start_ammo_fuel = max(warmup_start_ammo_fuel, cvar("g_balance_fuel_rotstable"));
-       }
-
-       WepSet precache_weapons = start_weapons;
-       if (g_warmup_allguns != 1)
-               precache_weapons |= warmup_start_weapons;
-       for (i = WEP_FIRST; i <= WEP_LAST; ++i)
-       {
-               e = get_weaponinfo(i);
-               if(precache_weapons & WepSet_FromWeapon(i))
-                       WEP_ACTION(i, WR_INIT);
-       }
-
-       start_ammo_shells = max(0, start_ammo_shells);
-       start_ammo_nails = max(0, start_ammo_nails);
-       start_ammo_rockets = max(0, start_ammo_rockets);
-       start_ammo_cells = max(0, start_ammo_cells);
-       start_ammo_plasma = max(0, start_ammo_plasma);
-       start_ammo_fuel = max(0, start_ammo_fuel);
-
-       warmup_start_ammo_shells = max(0, warmup_start_ammo_shells);
-       warmup_start_ammo_nails = max(0, warmup_start_ammo_nails);
-       warmup_start_ammo_rockets = max(0, warmup_start_ammo_rockets);
-       warmup_start_ammo_cells = max(0, warmup_start_ammo_cells);
-       warmup_start_ammo_plasma = max(0, warmup_start_ammo_plasma);
-       warmup_start_ammo_fuel = max(0, warmup_start_ammo_fuel);
-}
-
-float g_bugrigs;
-float g_bugrigs_planar_movement;
-float g_bugrigs_planar_movement_car_jumping;
-float g_bugrigs_reverse_spinning;
-float g_bugrigs_reverse_speeding;
-float g_bugrigs_reverse_stopping;
-float g_bugrigs_air_steering;
-float g_bugrigs_angle_smoothing;
-float g_bugrigs_friction_floor;
-float g_bugrigs_friction_brake;
-float g_bugrigs_friction_air;
-float g_bugrigs_accel;
-float g_bugrigs_speed_ref;
-float g_bugrigs_speed_pow;
-float g_bugrigs_steer;
-
-float sv_autotaunt;
-float sv_taunt;
-
-string GetGametype(); // g_world.qc
-void mutators_add(); // mutators.qc
-void readlevelcvars(void)
-{
-       // load mutators
-       mutators_add();
-
-       if(cvar("sv_allow_fullbright"))
-               serverflags |= SERVERFLAG_ALLOW_FULLBRIGHT;
-
-    g_bugrigs = cvar("g_bugrigs");
-    g_bugrigs_planar_movement = cvar("g_bugrigs_planar_movement");
-    g_bugrigs_planar_movement_car_jumping = cvar("g_bugrigs_planar_movement_car_jumping");
-    g_bugrigs_reverse_spinning = cvar("g_bugrigs_reverse_spinning");
-    g_bugrigs_reverse_speeding = cvar("g_bugrigs_reverse_speeding");
-    g_bugrigs_reverse_stopping = cvar("g_bugrigs_reverse_stopping");
-    g_bugrigs_air_steering = cvar("g_bugrigs_air_steering");
-    g_bugrigs_angle_smoothing = cvar("g_bugrigs_angle_smoothing");
-    g_bugrigs_friction_floor = cvar("g_bugrigs_friction_floor");
-    g_bugrigs_friction_brake = cvar("g_bugrigs_friction_brake");
-    g_bugrigs_friction_air = cvar("g_bugrigs_friction_air");
-    g_bugrigs_accel = cvar("g_bugrigs_accel");
-    g_bugrigs_speed_ref = cvar("g_bugrigs_speed_ref");
-    g_bugrigs_speed_pow = cvar("g_bugrigs_speed_pow");
-    g_bugrigs_steer = cvar("g_bugrigs_steer");
-
-       g_instagib = cvar("g_instagib");
-
-       sv_clones = cvar("sv_clones");
-       sv_foginterval = cvar("sv_foginterval");
-       g_cloaked = cvar("g_cloaked");
-       g_footsteps = cvar("g_footsteps");
-       g_grappling_hook = cvar("g_grappling_hook");
-       g_jetpack = cvar("g_jetpack");
-       sv_maxidle = cvar("sv_maxidle");
-       sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");
-       sv_autotaunt = cvar("sv_autotaunt");
-       sv_taunt = cvar("sv_taunt");
-
-       warmup_stage = cvar("g_warmup");
-       g_warmup_limit = cvar("g_warmup_limit");
-       g_warmup_allguns = cvar("g_warmup_allguns");
-       g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");
-
-       if ((g_race && g_race_qualifying == 2) || g_assault || cvar("g_campaign"))
-               warmup_stage = 0; // these modes cannot work together, sorry
-
-       g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
-       g_pickup_respawntime_superweapon = cvar("g_pickup_respawntime_superweapon");
-       g_pickup_respawntime_ammo = cvar("g_pickup_respawntime_ammo");
-       g_pickup_respawntime_short = cvar("g_pickup_respawntime_short");
-       g_pickup_respawntime_medium = cvar("g_pickup_respawntime_medium");
-       g_pickup_respawntime_long = cvar("g_pickup_respawntime_long");
-       g_pickup_respawntime_powerup = cvar("g_pickup_respawntime_powerup");
-       g_pickup_respawntimejitter_weapon = cvar("g_pickup_respawntimejitter_weapon");
-       g_pickup_respawntimejitter_superweapon = cvar("g_pickup_respawntimejitter_superweapon");
-       g_pickup_respawntimejitter_ammo = cvar("g_pickup_respawntimejitter_ammo");
-       g_pickup_respawntimejitter_short = cvar("g_pickup_respawntimejitter_short");
-       g_pickup_respawntimejitter_medium = cvar("g_pickup_respawntimejitter_medium");
-       g_pickup_respawntimejitter_long = cvar("g_pickup_respawntimejitter_long");
-       g_pickup_respawntimejitter_powerup = cvar("g_pickup_respawntimejitter_powerup");
-
-       g_weaponspeedfactor = cvar("g_weaponspeedfactor");
-       g_weaponratefactor = cvar("g_weaponratefactor");
-       g_weapondamagefactor = cvar("g_weapondamagefactor");
-       g_weaponforcefactor = cvar("g_weaponforcefactor");
-       g_weaponspreadfactor = cvar("g_weaponspreadfactor");
-
-       g_pickup_shells = cvar("g_pickup_shells");
-       g_pickup_shells_max = cvar("g_pickup_shells_max");
-       g_pickup_nails = cvar("g_pickup_nails");
-       g_pickup_nails_max = cvar("g_pickup_nails_max");
-       g_pickup_rockets = cvar("g_pickup_rockets");
-       g_pickup_rockets_max = cvar("g_pickup_rockets_max");
-       g_pickup_cells = cvar("g_pickup_cells");
-       g_pickup_cells_max = cvar("g_pickup_cells_max");
-       g_pickup_plasma = cvar("g_pickup_plasma");
-       g_pickup_plasma_max = cvar("g_pickup_plasma_max");
-       g_pickup_fuel = cvar("g_pickup_fuel");
-       g_pickup_fuel_jetpack = cvar("g_pickup_fuel_jetpack");
-       g_pickup_fuel_max = cvar("g_pickup_fuel_max");
-       g_pickup_armorsmall = cvar("g_pickup_armorsmall");
-       g_pickup_armorsmall_max = cvar("g_pickup_armorsmall_max");
-       g_pickup_armorsmall_anyway = cvar("g_pickup_armorsmall_anyway");
-       g_pickup_armormedium = cvar("g_pickup_armormedium");
-       g_pickup_armormedium_max = cvar("g_pickup_armormedium_max");
-       g_pickup_armormedium_anyway = cvar("g_pickup_armormedium_anyway");
-       g_pickup_armorbig = cvar("g_pickup_armorbig");
-       g_pickup_armorbig_max = cvar("g_pickup_armorbig_max");
-       g_pickup_armorbig_anyway = cvar("g_pickup_armorbig_anyway");
-       g_pickup_armorlarge = cvar("g_pickup_armorlarge");
-       g_pickup_armorlarge_max = cvar("g_pickup_armorlarge_max");
-       g_pickup_armorlarge_anyway = cvar("g_pickup_armorlarge_anyway");
-       g_pickup_healthsmall = cvar("g_pickup_healthsmall");
-       g_pickup_healthsmall_max = cvar("g_pickup_healthsmall_max");
-       g_pickup_healthsmall_anyway = cvar("g_pickup_healthsmall_anyway");
-       g_pickup_healthmedium = cvar("g_pickup_healthmedium");
-       g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max");
-       g_pickup_healthmedium_anyway = cvar("g_pickup_healthmedium_anyway");
-       g_pickup_healthlarge = cvar("g_pickup_healthlarge");
-       g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max");
-       g_pickup_healthlarge_anyway = cvar("g_pickup_healthlarge_anyway");
-       g_pickup_healthmega = cvar("g_pickup_healthmega");
-       g_pickup_healthmega_max = cvar("g_pickup_healthmega_max");
-       g_pickup_healthmega_anyway = cvar("g_pickup_healthmega_anyway");
-
-       g_pickup_ammo_anyway = cvar("g_pickup_ammo_anyway");
-       g_pickup_weapons_anyway = cvar("g_pickup_weapons_anyway");
-
-    g_weapon_stay = cvar(strcat("g_", GetGametype(), "_weapon_stay"));
-    if(!g_weapon_stay)
-        g_weapon_stay = cvar("g_weapon_stay");
-
-       if (!warmup_stage)
-               game_starttime = time + cvar("g_start_delay");
-
-       readplayerstartcvars();
-}
-
-//#NO AUTOCVARS END
-
-// Sound functions
-//string precache_sound (string s) = #19;
-// hack
-float precache_sound_index (string s) = #19;
-
-const float SND_VOLUME = 1;
-const float SND_ATTENUATION = 2;
-const float SND_LARGEENTITY = 8;
-const float SND_LARGESOUND = 16;
 
 float sound_allowed(float dest, entity e)
 {
@@ -1390,23 +867,6 @@ void precache()
 #include "precache-for-csqc.inc"
 }
 
-// WARNING: this kills the trace globals
-#define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return
-#define EXACTTRIGGER_INIT  WarpZoneLib_ExactTrigger_Init()
-
-const float INITPRIO_FIRST                             = 0;
-const float INITPRIO_GAMETYPE                  = 0;
-const float INITPRIO_GAMETYPE_FALLBACK         = 1;
-const float INITPRIO_FINDTARGET                = 10;
-const float INITPRIO_DROPTOFLOOR               = 20;
-const float INITPRIO_SETLOCATION               = 90;
-const float INITPRIO_LINKDOORS                         = 91;
-const float INITPRIO_LAST                              = 99;
-
-.void(void) initialize_entity;
-.float initialize_entity_order;
-.entity initialize_entity_next;
-entity initialize_entity_first;
 
 void make_safe_for_remove(entity e)
 {

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
new file mode 100644 (file)
index 0000000..a6d92ab
--- /dev/null
+++ b/qcsrc/server/miscfunctions.qh
@@ -0,0 +1,596 @@
+#ifndef MISCFUNCTIONS_H
+#define MISCFUNCTIONS_H
+
+var void remove(entity e);
+void objerror(string s);
+void droptofloor();
+.vector dropped_origin;
+
+void traceline_antilag (entity source, vector v1, vector v2, float nomonst, entity forent, float lag);
+void WarpZone_traceline_antilag (entity source, vector v1, vector v2, float nomonst, entity forent, float lag);
+
+void() spawnfunc_info_player_deathmatch; // needed for the other spawnpoints
+void() spawnpoint_use;
+string GetMapname();
+
+float DistributeEvenly_amount;
+float DistributeEvenly_totalweight;
+
+#define move_out_of_solid(e) WarpZoneLib_MoveOutOfSolid(e)
+
+const string STR_PLAYER = "player";
+const string STR_SPECTATOR = "spectator";
+const string STR_OBSERVER = "observer";
+
+#define IS_PLAYER(v)                   (v.classname == STR_PLAYER)
+#define IS_SPEC(v)                             (v.classname == STR_SPECTATOR)
+#define IS_OBSERVER(v)                         (v.classname == STR_OBSERVER)
+#define IS_CLIENT(v)                   (v.flags & FL_CLIENT)
+#define IS_BOT_CLIENT(v)               (clienttype(v) == CLIENTTYPE_BOT)
+#define IS_REAL_CLIENT(v)              (clienttype(v) == CLIENTTYPE_REAL)
+#define IS_NOT_A_CLIENT(v)             (clienttype(v) == CLIENTTYPE_NOTACLIENT)
+
+#define FOR_EACH_CLIENTSLOT(v) for(v = world; (v = nextent(v)) && (num_for_edict(v) <= maxclients); )
+#define FOR_EACH_CLIENT(v) FOR_EACH_CLIENTSLOT(v) if(IS_CLIENT(v))
+#define FOR_EACH_REALCLIENT(v) FOR_EACH_CLIENT(v) if(IS_REAL_CLIENT(v))
+
+#define FOR_EACH_PLAYER(v) FOR_EACH_CLIENT(v) if(IS_PLAYER(v))
+#define FOR_EACH_SPEC(v) FOR_EACH_CLIENT(v) if (!IS_PLAYER(v)) // Samual: shouldn't this be IS_SPEC(v)? and rather create a separate macro to include observers too
+#define FOR_EACH_REALPLAYER(v) FOR_EACH_REALCLIENT(v) if(IS_PLAYER(v))
+
+#define FOR_EACH_MONSTER(v) for(v = world; (v = findflags(v, flags, FL_MONSTER)) != world; )
+
+#define CENTER_OR_VIEWOFS(ent) (ent.origin + (IS_PLAYER(ent) ? ent.view_ofs : ((ent.mins + ent.maxs) * 0.5)))
+
+// copies a string to a tempstring (so one can strunzone it)
+string strcat1(string s) = #115; // FRIK_FILE
+
+float logfile_open;
+float logfile;
+
+#define strstr strstrofs
+/*
+// NOTE: DO NOT USE THIS FUNCTION TOO OFTEN.
+// IT WILL MOST PROBABLY DESTROY _ALL_ OTHER TEMP
+// STRINGS AND TAKE QUITE LONG. haystack and needle MUST
+// BE CONSTANT OR strzoneD!
+float strstr(string haystack, string needle, float offset)
+{
+       float len, endpos;
+       string found;
+       len = strlen(needle);
+       endpos = strlen(haystack) - len;
+       while(offset <= endpos)
+       {
+               found = substring(haystack, offset, len);
+               if(found == needle)
+                       return offset;
+               offset = offset + 1;
+       }
+       return -1;
+}
+*/
+
+const float NUM_NEAREST_ENTITIES = 4;
+entity nearest_entity[NUM_NEAREST_ENTITIES];
+float nearest_length[NUM_NEAREST_ENTITIES];
+
+
+//#NO AUTOCVARS START
+
+float g_pickup_shells;
+float g_pickup_shells_max;
+float g_pickup_nails;
+float g_pickup_nails_max;
+float g_pickup_rockets;
+float g_pickup_rockets_max;
+float g_pickup_cells;
+float g_pickup_cells_max;
+float g_pickup_plasma;
+float g_pickup_plasma_max;
+float g_pickup_fuel;
+float g_pickup_fuel_jetpack;
+float g_pickup_fuel_max;
+float g_pickup_armorsmall;
+float g_pickup_armorsmall_max;
+float g_pickup_armorsmall_anyway;
+float g_pickup_armormedium;
+float g_pickup_armormedium_max;
+float g_pickup_armormedium_anyway;
+float g_pickup_armorbig;
+float g_pickup_armorbig_max;
+float g_pickup_armorbig_anyway;
+float g_pickup_armorlarge;
+float g_pickup_armorlarge_max;
+float g_pickup_armorlarge_anyway;
+float g_pickup_healthsmall;
+float g_pickup_healthsmall_max;
+float g_pickup_healthsmall_anyway;
+float g_pickup_healthmedium;
+float g_pickup_healthmedium_max;
+float g_pickup_healthmedium_anyway;
+float g_pickup_healthlarge;
+float g_pickup_healthlarge_max;
+float g_pickup_healthlarge_anyway;
+float g_pickup_healthmega;
+float g_pickup_healthmega_max;
+float g_pickup_healthmega_anyway;
+float g_pickup_ammo_anyway;
+float g_pickup_weapons_anyway;
+float g_weaponarena;
+WepSet g_weaponarena_weapons;
+float g_weaponarena_random;
+float g_weaponarena_random_with_blaster;
+string g_weaponarena_list;
+float g_weaponspeedfactor;
+float g_weaponratefactor;
+float g_weapondamagefactor;
+float g_weaponforcefactor;
+float g_weaponspreadfactor;
+
+WepSet start_weapons;
+WepSet start_weapons_default;
+WepSet start_weapons_defaultmask;
+float start_items;
+float start_ammo_shells;
+float start_ammo_nails;
+float start_ammo_rockets;
+float start_ammo_cells;
+float start_ammo_plasma;
+float start_ammo_fuel;
+float start_health;
+float start_armorvalue;
+WepSet warmup_start_weapons;
+WepSet warmup_start_weapons_default;
+WepSet warmup_start_weapons_defaultmask;
+#define WARMUP_START_WEAPONS ((g_warmup_allguns == 1) ? (warmup_start_weapons & (weaponsInMap | start_weapons)) : warmup_start_weapons)
+float warmup_start_ammo_shells;
+float warmup_start_ammo_nails;
+float warmup_start_ammo_rockets;
+float warmup_start_ammo_cells;
+float warmup_start_ammo_plasma;
+float warmup_start_ammo_fuel;
+float warmup_start_health;
+float warmup_start_armorvalue;
+float g_weapon_stay;
+
+float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still needs done?
+{
+       float i = weaponinfo.weapon;
+       float d = 0;
+
+       if (!i)
+               return 0;
+
+       if (g_lms || g_ca || allguns)
+       {
+               if(weaponinfo.spawnflags & WEP_FLAG_NORMAL)
+                       d = true;
+               else
+                       d = false;
+       }
+       else if (g_cts)
+               d = (i == WEP_SHOTGUN);
+       else if (g_nexball)
+               d = 0; // weapon is set a few lines later
+       else
+               d = !(!weaponinfo.weaponstart);
+
+       if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
+               d |= (i == WEP_HOOK);
+       if(!g_cts && (weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED)) // never default mutator blocked guns
+               d = 0;
+
+       float t = weaponinfo.weaponstartoverride;
+
+       //print(strcat("want_weapon: ", weaponinfo.netname, " - d: ", ftos(d), ", t: ", ftos(t), ". \n"));
+
+       // bit order in t:
+       // 1: want or not
+       // 2: is default?
+       // 4: is set by default?
+       if(t < 0)
+               t = 4 | (3 * d);
+       else
+               t |= (2 * d);
+
+       return t;
+}
+
+void readplayerstartcvars()
+{
+       entity e;
+       float i, j, t;
+       string s;
+
+       // initialize starting values for players
+       start_weapons = '0 0 0';
+       start_weapons_default = '0 0 0';
+       start_weapons_defaultmask = '0 0 0';
+       start_items = 0;
+       start_ammo_shells = 0;
+       start_ammo_nails = 0;
+       start_ammo_rockets = 0;
+       start_ammo_cells = 0;
+       start_ammo_plasma = 0;
+       start_health = cvar("g_balance_health_start");
+       start_armorvalue = cvar("g_balance_armor_start");
+
+       g_weaponarena = 0;
+       g_weaponarena_weapons = '0 0 0';
+
+       s = cvar_string("g_weaponarena");
+       if (s == "0" || s == "")
+       {
+               if(g_ca)
+                       s = "most";
+       }
+
+       if (s == "0" || s == "")
+       {
+               // no arena
+       }
+       else if (s == "off")
+       {
+               // forcibly turn off weaponarena
+       }
+       else if (s == "all" || s == "1")
+       {
+               g_weaponarena = 1;
+               g_weaponarena_list = "All Weapons";
+               for (j = WEP_FIRST; j <= WEP_LAST; ++j)
+               {
+                       e = get_weaponinfo(j);
+                       if (!(e.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+                               g_weaponarena_weapons |= WepSet_FromWeapon(j);
+               }
+       }
+       else if (s == "most")
+       {
+               g_weaponarena = 1;
+               g_weaponarena_list = "Most Weapons";
+               for (j = WEP_FIRST; j <= WEP_LAST; ++j)
+               {
+                       e = get_weaponinfo(j);
+                       if (!(e.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+                               if (e.spawnflags & WEP_FLAG_NORMAL)
+                                       g_weaponarena_weapons |= WepSet_FromWeapon(j);
+               }
+       }
+       else if (s == "none")
+       {
+               g_weaponarena = 1;
+               g_weaponarena_list = "No Weapons";
+       }
+       else
+       {
+               g_weaponarena = 1;
+               t = tokenize_console(s);
+               g_weaponarena_list = "";
+               for (i = 0; i < t; ++i)
+               {
+                       s = argv(i);
+                       for (j = WEP_FIRST; j <= WEP_LAST; ++j)
+                       {
+                               e = get_weaponinfo(j);
+                               if (e.netname == s)
+                               {
+                                       g_weaponarena_weapons |= WepSet_FromWeapon(j);
+                                       g_weaponarena_list = strcat(g_weaponarena_list, e.message, " & ");
+                                       break;
+                               }
+                       }
+                       if (j > WEP_LAST)
+                       {
+                               print("The weapon mutator list contains an unknown weapon ", s, ". Skipped.\n");
+                       }
+               }
+               g_weaponarena_list = strzone(substring(g_weaponarena_list, 0, strlen(g_weaponarena_list) - 3));
+       }
+
+       if(g_weaponarena)
+               g_weaponarena_random = cvar("g_weaponarena_random");
+       else
+               g_weaponarena_random = 0;
+       g_weaponarena_random_with_blaster = cvar("g_weaponarena_random_with_blaster");
+
+       if (g_weaponarena)
+       {
+               g_weapon_stay = 0; // incompatible
+               start_weapons = g_weaponarena_weapons;
+               start_items |= IT_UNLIMITED_AMMO;
+       }
+       else
+       {
+               for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+               {
+                       e = get_weaponinfo(i);
+                       float w = want_weapon(e, false);
+                       if(w & 1)
+                               start_weapons |= WepSet_FromWeapon(i);
+                       if(w & 2)
+                               start_weapons_default |= WepSet_FromWeapon(i);
+                       if(w & 4)
+                               start_weapons_defaultmask |= WepSet_FromWeapon(i);
+               }
+       }
+
+       if(!cvar("g_use_ammunition"))
+               start_items |= IT_UNLIMITED_AMMO;
+
+       if(start_items & IT_UNLIMITED_WEAPON_AMMO)
+       {
+               start_ammo_shells = 999;
+               start_ammo_nails = 999;
+               start_ammo_rockets = 999;
+               start_ammo_cells = 999;
+               start_ammo_plasma = 999;
+               start_ammo_fuel = 999;
+       }
+       else
+       {
+               start_ammo_shells = cvar("g_start_ammo_shells");
+               start_ammo_nails = cvar("g_start_ammo_nails");
+               start_ammo_rockets = cvar("g_start_ammo_rockets");
+               start_ammo_cells = cvar("g_start_ammo_cells");
+               start_ammo_plasma = cvar("g_start_ammo_plasma");
+               start_ammo_fuel = cvar("g_start_ammo_fuel");
+       }
+
+       if (warmup_stage)
+       {
+               warmup_start_ammo_shells = start_ammo_shells;
+               warmup_start_ammo_nails = start_ammo_nails;
+               warmup_start_ammo_rockets = start_ammo_rockets;
+               warmup_start_ammo_cells = start_ammo_cells;
+               warmup_start_ammo_plasma = start_ammo_plasma;
+               warmup_start_ammo_fuel = start_ammo_fuel;
+               warmup_start_health = start_health;
+               warmup_start_armorvalue = start_armorvalue;
+               warmup_start_weapons = start_weapons;
+               warmup_start_weapons_default = start_weapons_default;
+               warmup_start_weapons_defaultmask = start_weapons_defaultmask;
+
+               if (!g_weaponarena && !g_ca)
+               {
+                       warmup_start_ammo_shells = cvar("g_warmup_start_ammo_shells");
+                       warmup_start_ammo_nails = cvar("g_warmup_start_ammo_nails");
+                       warmup_start_ammo_rockets = cvar("g_warmup_start_ammo_rockets");
+                       warmup_start_ammo_cells = cvar("g_warmup_start_ammo_cells");
+                       warmup_start_ammo_plasma = cvar("g_warmup_start_ammo_plasma");
+                       warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
+                       warmup_start_health = cvar("g_warmup_start_health");
+                       warmup_start_armorvalue = cvar("g_warmup_start_armor");
+                       warmup_start_weapons = '0 0 0';
+                       warmup_start_weapons_default = '0 0 0';
+                       warmup_start_weapons_defaultmask = '0 0 0';
+                       for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+                       {
+                               e = get_weaponinfo(i);
+                               float w = want_weapon(e, g_warmup_allguns);
+                               if(w & 1)
+                                       warmup_start_weapons |= WepSet_FromWeapon(i);
+                               if(w & 2)
+                                       warmup_start_weapons_default |= WepSet_FromWeapon(i);
+                               if(w & 4)
+                                       warmup_start_weapons_defaultmask |= WepSet_FromWeapon(i);
+                       }
+               }
+       }
+
+       if (g_jetpack)
+               start_items |= IT_JETPACK;
+
+       MUTATOR_CALLHOOK(SetStartItems);
+
+       if ((start_items & IT_JETPACK) || (g_grappling_hook && (start_weapons & WEPSET_HOOK)))
+       {
+               start_items |= IT_FUEL_REGEN;
+               start_ammo_fuel = max(start_ammo_fuel, cvar("g_balance_fuel_rotstable"));
+               warmup_start_ammo_fuel = max(warmup_start_ammo_fuel, cvar("g_balance_fuel_rotstable"));
+       }
+
+       WepSet precache_weapons = start_weapons;
+       if (g_warmup_allguns != 1)
+               precache_weapons |= warmup_start_weapons;
+       for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+       {
+               e = get_weaponinfo(i);
+               if(precache_weapons & WepSet_FromWeapon(i))
+                       WEP_ACTION(i, WR_INIT);
+       }
+
+       start_ammo_shells = max(0, start_ammo_shells);
+       start_ammo_nails = max(0, start_ammo_nails);
+       start_ammo_rockets = max(0, start_ammo_rockets);
+       start_ammo_cells = max(0, start_ammo_cells);
+       start_ammo_plasma = max(0, start_ammo_plasma);
+       start_ammo_fuel = max(0, start_ammo_fuel);
+
+       warmup_start_ammo_shells = max(0, warmup_start_ammo_shells);
+       warmup_start_ammo_nails = max(0, warmup_start_ammo_nails);
+       warmup_start_ammo_rockets = max(0, warmup_start_ammo_rockets);
+       warmup_start_ammo_cells = max(0, warmup_start_ammo_cells);
+       warmup_start_ammo_plasma = max(0, warmup_start_ammo_plasma);
+       warmup_start_ammo_fuel = max(0, warmup_start_ammo_fuel);
+}
+
+float g_bugrigs;
+float g_bugrigs_planar_movement;
+float g_bugrigs_planar_movement_car_jumping;
+float g_bugrigs_reverse_spinning;
+float g_bugrigs_reverse_speeding;
+float g_bugrigs_reverse_stopping;
+float g_bugrigs_air_steering;
+float g_bugrigs_angle_smoothing;
+float g_bugrigs_friction_floor;
+float g_bugrigs_friction_brake;
+float g_bugrigs_friction_air;
+float g_bugrigs_accel;
+float g_bugrigs_speed_ref;
+float g_bugrigs_speed_pow;
+float g_bugrigs_steer;
+
+float sv_autotaunt;
+float sv_taunt;
+
+string GetGametype(); // g_world.qc
+void mutators_add(); // mutators.qc
+void readlevelcvars(void)
+{
+       // load mutators
+       mutators_add();
+
+       if(cvar("sv_allow_fullbright"))
+               serverflags |= SERVERFLAG_ALLOW_FULLBRIGHT;
+
+    g_bugrigs = cvar("g_bugrigs");
+    g_bugrigs_planar_movement = cvar("g_bugrigs_planar_movement");
+    g_bugrigs_planar_movement_car_jumping = cvar("g_bugrigs_planar_movement_car_jumping");
+    g_bugrigs_reverse_spinning = cvar("g_bugrigs_reverse_spinning");
+    g_bugrigs_reverse_speeding = cvar("g_bugrigs_reverse_speeding");
+    g_bugrigs_reverse_stopping = cvar("g_bugrigs_reverse_stopping");
+    g_bugrigs_air_steering = cvar("g_bugrigs_air_steering");
+    g_bugrigs_angle_smoothing = cvar("g_bugrigs_angle_smoothing");
+    g_bugrigs_friction_floor = cvar("g_bugrigs_friction_floor");
+    g_bugrigs_friction_brake = cvar("g_bugrigs_friction_brake");
+    g_bugrigs_friction_air = cvar("g_bugrigs_friction_air");
+    g_bugrigs_accel = cvar("g_bugrigs_accel");
+    g_bugrigs_speed_ref = cvar("g_bugrigs_speed_ref");
+    g_bugrigs_speed_pow = cvar("g_bugrigs_speed_pow");
+    g_bugrigs_steer = cvar("g_bugrigs_steer");
+
+       g_instagib = cvar("g_instagib");
+
+       sv_clones = cvar("sv_clones");
+       sv_foginterval = cvar("sv_foginterval");
+       g_cloaked = cvar("g_cloaked");
+       g_footsteps = cvar("g_footsteps");
+       g_grappling_hook = cvar("g_grappling_hook");
+       g_jetpack = cvar("g_jetpack");
+       sv_maxidle = cvar("sv_maxidle");
+       sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");
+       sv_autotaunt = cvar("sv_autotaunt");
+       sv_taunt = cvar("sv_taunt");
+
+       warmup_stage = cvar("g_warmup");
+       g_warmup_limit = cvar("g_warmup_limit");
+       g_warmup_allguns = cvar("g_warmup_allguns");
+       g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");
+
+       if ((g_race && g_race_qualifying == 2) || g_assault || cvar("g_campaign"))
+               warmup_stage = 0; // these modes cannot work together, sorry
+
+       g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
+       g_pickup_respawntime_superweapon = cvar("g_pickup_respawntime_superweapon");
+       g_pickup_respawntime_ammo = cvar("g_pickup_respawntime_ammo");
+       g_pickup_respawntime_short = cvar("g_pickup_respawntime_short");
+       g_pickup_respawntime_medium = cvar("g_pickup_respawntime_medium");
+       g_pickup_respawntime_long = cvar("g_pickup_respawntime_long");
+       g_pickup_respawntime_powerup = cvar("g_pickup_respawntime_powerup");
+       g_pickup_respawntimejitter_weapon = cvar("g_pickup_respawntimejitter_weapon");
+       g_pickup_respawntimejitter_superweapon = cvar("g_pickup_respawntimejitter_superweapon");
+       g_pickup_respawntimejitter_ammo = cvar("g_pickup_respawntimejitter_ammo");
+       g_pickup_respawntimejitter_short = cvar("g_pickup_respawntimejitter_short");
+       g_pickup_respawntimejitter_medium = cvar("g_pickup_respawntimejitter_medium");
+       g_pickup_respawntimejitter_long = cvar("g_pickup_respawntimejitter_long");
+       g_pickup_respawntimejitter_powerup = cvar("g_pickup_respawntimejitter_powerup");
+
+       g_weaponspeedfactor = cvar("g_weaponspeedfactor");
+       g_weaponratefactor = cvar("g_weaponratefactor");
+       g_weapondamagefactor = cvar("g_weapondamagefactor");
+       g_weaponforcefactor = cvar("g_weaponforcefactor");
+       g_weaponspreadfactor = cvar("g_weaponspreadfactor");
+
+       g_pickup_shells = cvar("g_pickup_shells");
+       g_pickup_shells_max = cvar("g_pickup_shells_max");
+       g_pickup_nails = cvar("g_pickup_nails");
+       g_pickup_nails_max = cvar("g_pickup_nails_max");
+       g_pickup_rockets = cvar("g_pickup_rockets");
+       g_pickup_rockets_max = cvar("g_pickup_rockets_max");
+       g_pickup_cells = cvar("g_pickup_cells");
+       g_pickup_cells_max = cvar("g_pickup_cells_max");
+       g_pickup_plasma = cvar("g_pickup_plasma");
+       g_pickup_plasma_max = cvar("g_pickup_plasma_max");
+       g_pickup_fuel = cvar("g_pickup_fuel");
+       g_pickup_fuel_jetpack = cvar("g_pickup_fuel_jetpack");
+       g_pickup_fuel_max = cvar("g_pickup_fuel_max");
+       g_pickup_armorsmall = cvar("g_pickup_armorsmall");
+       g_pickup_armorsmall_max = cvar("g_pickup_armorsmall_max");
+       g_pickup_armorsmall_anyway = cvar("g_pickup_armorsmall_anyway");
+       g_pickup_armormedium = cvar("g_pickup_armormedium");
+       g_pickup_armormedium_max = cvar("g_pickup_armormedium_max");
+       g_pickup_armormedium_anyway = cvar("g_pickup_armormedium_anyway");
+       g_pickup_armorbig = cvar("g_pickup_armorbig");
+       g_pickup_armorbig_max = cvar("g_pickup_armorbig_max");
+       g_pickup_armorbig_anyway = cvar("g_pickup_armorbig_anyway");
+       g_pickup_armorlarge = cvar("g_pickup_armorlarge");
+       g_pickup_armorlarge_max = cvar("g_pickup_armorlarge_max");
+       g_pickup_armorlarge_anyway = cvar("g_pickup_armorlarge_anyway");
+       g_pickup_healthsmall = cvar("g_pickup_healthsmall");
+       g_pickup_healthsmall_max = cvar("g_pickup_healthsmall_max");
+       g_pickup_healthsmall_anyway = cvar("g_pickup_healthsmall_anyway");
+       g_pickup_healthmedium = cvar("g_pickup_healthmedium");
+       g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max");
+       g_pickup_healthmedium_anyway = cvar("g_pickup_healthmedium_anyway");
+       g_pickup_healthlarge = cvar("g_pickup_healthlarge");
+       g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max");
+       g_pickup_healthlarge_anyway = cvar("g_pickup_healthlarge_anyway");
+       g_pickup_healthmega = cvar("g_pickup_healthmega");
+       g_pickup_healthmega_max = cvar("g_pickup_healthmega_max");
+       g_pickup_healthmega_anyway = cvar("g_pickup_healthmega_anyway");
+
+       g_pickup_ammo_anyway = cvar("g_pickup_ammo_anyway");
+       g_pickup_weapons_anyway = cvar("g_pickup_weapons_anyway");
+
+    g_weapon_stay = cvar(strcat("g_", GetGametype(), "_weapon_stay"));
+    if(!g_weapon_stay)
+        g_weapon_stay = cvar("g_weapon_stay");
+
+       if (!warmup_stage)
+               game_starttime = time + cvar("g_start_delay");
+
+       readplayerstartcvars();
+}
+
+//#NO AUTOCVARS END
+
+
+// Sound functions
+//string precache_sound (string s) = #19;
+// hack
+float precache_sound_index (string s) = #19;
+
+const float SND_VOLUME = 1;
+const float SND_ATTENUATION = 2;
+const float SND_LARGEENTITY = 8;
+const float SND_LARGESOUND = 16;
+
+// WARNING: this kills the trace globals
+#define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return
+#define EXACTTRIGGER_INIT  WarpZoneLib_ExactTrigger_Init()
+
+const float INITPRIO_FIRST                             = 0;
+const float INITPRIO_GAMETYPE                  = 0;
+const float INITPRIO_GAMETYPE_FALLBACK         = 1;
+const float INITPRIO_FINDTARGET                = 10;
+const float INITPRIO_DROPTOFLOOR               = 20;
+const float INITPRIO_SETLOCATION               = 90;
+const float INITPRIO_LINKDOORS                         = 91;
+const float INITPRIO_LAST                              = 99;
+
+.void(void) initialize_entity;
+.float initialize_entity_order;
+.entity initialize_entity_next;
+entity initialize_entity_first;
+
+
+
+
+
+float sound_allowed(float dest, entity e);
+void InitializeEntity(entity e, void(void) func, float order);
+void SetCustomizer(entity e, float(void) customizer, void(void) uncustomizer);
+void Net_LinkEntity(entity e, float docull, float dt, float(entity, float) sendfunc);
+
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/movelib.qc b/qcsrc/server/movelib.qc
index 66c13162f4a9c667f0b4c38eb977e0dd85e509b7..a156074d1929acad0cc36c5f4304430296b3b3dd 100644 (file)
--- a/qcsrc/server/movelib.qc
+++ b/qcsrc/server/movelib.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+    #include "../dpdefs/csprogsdefs.qc"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../csqcmodellib/sv_model.qh"
+#endif
+
 #ifdef SVQC
 .vector moveto;
 

diff --git a/qcsrc/server/mutators/mutators.qc b/qcsrc/server/mutators/mutators.qc
index 0fa2caab27c78bbdb679682d7527be4b97afbb17..4baa94836f3999d53787df1e8bd7ad59a81f0589 100644 (file)
--- a/qcsrc/server/mutators/mutators.qc
+++ b/qcsrc/server/mutators/mutators.qc
@@ -1,3 +1,12 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../sys-post.qh"
+    #include "mutators_include.qh"
+    #include "../../common/mapinfo.qh"
+#endif
+
 void mutators_add()
 {
        #define CHECK_MUTATOR_ADD(mut_cvar,mut_name,dependence) \

diff --git a/qcsrc/server/mutators/mutators_include.qc b/qcsrc/server/mutators/mutators_include.qc
index 0f52e34f033aa6b9f6f1231f9043494cea3d3e59..2603329614ccbb54299bd96f06c6a2590f926d9d 100644 (file)
--- a/qcsrc/server/mutators/mutators_include.qc
+++ b/qcsrc/server/mutators/mutators_include.qc
@@ -1,3 +1,88 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../../common/util-pre.qh"
+    #include "../sys-pre.qh"
+    #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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_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"
+    #include "../pathlib/pathlib.qh"
+    #include "../tturrets/include/turrets.qh"
+    #include "../vehicles/vehicles.qh"
+#endif
+
 #include "base.qc"
 #include "gamemode_assault.qc"
 #include "gamemode_ca.qc"

diff --git a/qcsrc/server/mutators/mutators_include.qh b/qcsrc/server/mutators/mutators_include.qh
index c869ab69669a6eab1da1abc924c94da93c5bd70e..3a83b2b57d758a649e753c45954449e45da55c41 100644 (file)
--- a/qcsrc/server/mutators/mutators_include.qh
+++ b/qcsrc/server/mutators/mutators_include.qh
@@ -1,3 +1,57 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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"
@@ -16,3 +70,4 @@
 #include "mutator_overkill.qh"
 #include "mutator_nades.qh"
 #include "mutator_buffs.qh"
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/pathlib/pathlib.qh b/qcsrc/server/pathlib/pathlib.qh
index 55bd95dbd831d9039d7729c98a02d22f0ad4c60b..300bf39239192455f166ad37eca9f42237990371 100644 (file)
--- a/qcsrc/server/pathlib/pathlib.qh
+++ b/qcsrc/server/pathlib/pathlib.qh
@@ -1,3 +1,89 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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;
@@ -116,3 +202,4 @@ var float  pathlib_wpp_waypointcallback(entity wp, entity wp_prev);
 #include "expandnode.qc"
 #include "main.qc"
 #include "path_waypoint.qc"
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/playerdemo.qc b/qcsrc/server/playerdemo.qc
index b848cfac767a5b44612c70d65bd5e2bdd82eb2c3..cb61a55a528c418e3a6ffb0183cad4e392320eb3 100644 (file)
--- a/qcsrc/server/playerdemo.qc
+++ b/qcsrc/server/playerdemo.qc
@@ -1,3 +1,12 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "defs.qh"
+    #include "playerdemo.qh"
+#endif
+
 .float playerdemo_fh;
 .float playerdemo_mode;
 .float playerdemo_starttime;

diff --git a/qcsrc/server/playerdemo.qh b/qcsrc/server/playerdemo.qh
index b790683675003ee00ab3e6de59dcd0e05e04fac9..346dcf45c92e21f0c82b9dcf53c8e5e333d0bd34 100644 (file)
--- a/qcsrc/server/playerdemo.qh
+++ b/qcsrc/server/playerdemo.qh
@@ -1,3 +1,84 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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();
@@ -5,3 +86,4 @@ float playerdemo_read();
 
 void playerdemo_open_read(string f);
 void playerdemo_open_write(string f);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 16fde19550129f6cf9b6cfcd72a21c81ac6cc356..008dd7a1a2ddae55577473c64e8e73d300a5d7f3 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -1,3 +1,24 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../warpzonelib/anglestransform.qh"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "../common/notifications.qh"
+    #include "../common/deathtypes.qh"
+    #include "mutators/mutators_include.qh"
+    #include "../csqcmodellib/sv_model.qh"
+    #include "portals.qh"
+    #include "g_hook.qh"
+#endif
+
 #define PORTALS_ARE_NOT_SOLID
 
 const vector SAFENUDGE = '1 1 1';

diff --git a/qcsrc/server/portals.qh b/qcsrc/server/portals.qh
index cd0bc0408097b737ee604ef1bd9aa654232ce42a..03fa3d54684fa2002fd92d7a6db4591c4b29c8c9 100644 (file)
--- a/qcsrc/server/portals.qh
+++ b/qcsrc/server/portals.qh
@@ -1,3 +1,76 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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;
 
@@ -9,3 +82,4 @@ void Portal_ClearWithID(entity own, float id);
 
 vector Portal_ApplyTransformToPlayerAngle(vector transform, vector vangle);
 void Portal_ClearAll_PortalsOnly(entity own);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index aa70d407cf03e2cf4d1ce77d92494a68c8bcb2b1..2cf7f9f78b3fe24e73ad81f47c40c87fd14de8dc 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -1,3 +1,25 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "../common/notifications.qh"
+    #include "../common/deathtypes.qh"
+    #include "mutators/mutators_include.qh"
+    #include "../common/mapinfo.qh"
+    #include "command/sv_cmd.qh"
+    #include "portals.qh"
+    #include "scores.qh"
+    #include "spawnpoints.qh"
+    #include "race.qh"
+#endif
+
 float race_readTime(string map, float pos)
 {
        string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;

diff --git a/qcsrc/server/race.qh b/qcsrc/server/race.qh
index 09b4b36ce4aadbb1619ae6d56c1d1b2df8a54143..e72a93fe0f9699be7e6e4150e63741f83b164232 100644 (file)
--- a/qcsrc/server/race.qh
+++ b/qcsrc/server/race.qh
@@ -1,3 +1,82 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
@@ -26,3 +105,4 @@ float race_GetFractionalLapCount(entity e);
 float race_readTime(string map, float pos);
 string race_readUID(string map, float pos);
 string race_readName(string map, float pos);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 6681151dfbc2d871e520a821eb84e58fbb6331e6..e6f5c9a4324e668210630df5853c32b12bf313d1 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../common/util.qh"
+    #include "defs.qh"
+    #include "round_handler.qh"
+#endif
+
 void round_handler_Think()
 {
        float f;

diff --git a/qcsrc/server/round_handler.qh b/qcsrc/server/round_handler.qh
index 90ffc33fa3f5f2949b6c7382df7adc766bfc083c..8751751cead529f9b377c59eb5590da9b9985b77 100644 (file)
--- a/qcsrc/server/round_handler.qh
+++ b/qcsrc/server/round_handler.qh
@@ -1,3 +1,85 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
@@ -21,3 +103,4 @@ void round_handler_Remove();
 #define round_handler_IsRoundStarted() (!round_handler.wait && !round_handler.cnt)
 #define round_handler_GetEndTime() (round_handler.round_endtime)
 
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index b7278241e958288dceec32d8cfc4aa57744dd84e..23bca3f1f507f39dea526351f1a12906e1a39534 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -1,3 +1,20 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../common/constants.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "mutators/mutators_include.qh"
+    #include "../common/mapinfo.qh"
+    #include "../common/playerstats.qh"
+    #include "scores.qh"
+#endif
+
 .entity scorekeeper;
 entity teamscorekeepers[16];
 string scores_label[MAX_SCORE];

diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh
index c26a4d295ea78cc9ab977d447f336ce7dbcd424f..1d0f17b817cd1d7c690ab3ba477758a5ea10c9d8 100644 (file)
--- a/qcsrc/server/scores.qh
+++ b/qcsrc/server/scores.qh
@@ -1,3 +1,78 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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];
@@ -124,3 +199,4 @@ string GetTeamScoreString(float tm, float shortString);
  * nospectators: exclude spectators
  */
 entity PlayerScore_Sort(.float field, float teams, float strict, float nospectators);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index 0b9d120d43c6ec99c99d3ba902434676a141cbf5..833041fad93d7f6bb8a122f82916a5628422642c 100644 (file)
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../common/constants.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "scores.qh"
+#endif
+
 float c1, c2, c3, c4;
 void CheckAllowedTeams (entity for_whom);
 
@@ -43,4 +53,3 @@ void ScoreRules_generic()
                ScoreRules_basics(0, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true);
        ScoreRules_basics_end();
 }
-

diff --git a/qcsrc/server/secret.qc b/qcsrc/server/secret.qc
index 06f7e075ddcc241a0323b6d5a7a31efbf5f8d5ec..7d5ca207b092993ab467ad29946ccfcb97ba742e 100644 (file)
--- a/qcsrc/server/secret.qc
+++ b/qcsrc/server/secret.qc
@@ -1,4 +1,11 @@
-
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../common/util.qh"
+    #include "defs.qh"
+    #include "secret.qh"
+#endif
 
 void secrets_setstatus() {
        self.stat_secrets_total = secrets_total;

diff --git a/qcsrc/server/secret.qh b/qcsrc/server/secret.qh
index dd94b192195634c277aa16615de1da490a5b0ef6..a99ea5baf20d1662be77f5c7892eca99adedf75f 100644 (file)
--- a/qcsrc/server/secret.qh
+++ b/qcsrc/server/secret.qh
@@ -1,3 +1,87 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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.
  */
@@ -16,4 +100,4 @@ float secrets_found;
  * update secrets status.
  */
 void secrets_setstatus();
-
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 552981ff33c3fd7a7ed8b8cd58415ed92e9d4cf2..10ef623e7d101fae0b2e9b896b00ddfa50a4fc41 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,3 +1,20 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/constants.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "mutators/mutators_include.qh"
+    #include "spawnpoints.qh"
+    #include "race.qh"
+#endif
+
 float SpawnPoint_Send(entity to, float sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_SPAWNPOINT);

diff --git a/qcsrc/server/spawnpoints.qh b/qcsrc/server/spawnpoints.qh
index 607629e42578834ed10e98c99ac66b28c82a8148..7345a36ae8ddb4355aae170d0e06f993e714e956 100644 (file)
--- a/qcsrc/server/spawnpoints.qh
+++ b/qcsrc/server/spawnpoints.qh
@@ -1,5 +1,82 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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);
 entity Spawn_FilterOutBadSpots(entity firstspot, float mindist, float teamcheck);
 entity SelectSpawnPoint (float anypoint);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/steerlib.qc b/qcsrc/server/steerlib.qc
index fb243792bcd2c843955b4ed516245ae3de5f3fa0..0b275f628b0d11558581aea8a146de211d6da8ed 100644 (file)
--- a/qcsrc/server/steerlib.qc
+++ b/qcsrc/server/steerlib.qc
@@ -1,3 +1,10 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+#endif
+
 .vector steerto;
 
 /**

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index fa1066b698da988c67d5c0eb74ec5cc966d0b613..40b3d950a082d019fe8cc6e5eb8705abfea89486 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -1,3 +1,28 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../warpzonelib/common.qh"
+    #include "../warpzonelib/server.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "weapons/csqcprojectile.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/deathtypes.qh"
+    #include "mutators/mutators_include.qh"
+    #include "vehicles/vehicles_def.qh"
+    #include "../common/mapinfo.qh"
+    #include "command/common.qh"
+    #include "../csqcmodellib/sv_model.qh"
+    #include "anticheat.qh"
+    #include "g_hook.qh"
+#endif
+
 void CreatureFrame (void)
 {
        entity oldself;

diff --git a/qcsrc/server/sys-post.qh b/qcsrc/server/sys-post.qh
index 10b1abcef9909e7299f567bd9d53844f9a0c3519..38fc0f1ccec2b1a4ff331ef248aaae536d3b9976 100644 (file)
--- a/qcsrc/server/sys-post.qh
+++ b/qcsrc/server/sys-post.qh
@@ -1,3 +1,15 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+#endif
+
 #pragma noref 0
 
 #undef ATTEN_NORM
@@ -12,3 +24,4 @@
 var float(string name) cvar;
 var string(string name) cvar_string;
 var void(string name, string value) cvar_set;
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/sys-pre.qh b/qcsrc/server/sys-pre.qh
index 1907cb2bb944ce0e692f46c1fba47207ca54bbf4..07c5209389232ee7e78ab1f74236efbd07eca590 100644 (file)
--- a/qcsrc/server/sys-pre.qh
+++ b/qcsrc/server/sys-pre.qh
@@ -1,4 +1,11 @@
-#define SVQC
+#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
@@ -10,3 +17,4 @@
 #define cvar builtin_cvar
 
 #pragma noref 1
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/t_halflife.qc b/qcsrc/server/t_halflife.qc
index bb2254c977d91e4cd427b5d3e6c2c3fcfea115a0..72fd0f07ff25ebda24fe4d9d88d0b39eb3f235aa 100644 (file)
--- a/qcsrc/server/t_halflife.qc
+++ b/qcsrc/server/t_halflife.qc
@@ -1,3 +1,11 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../warpzonelib/util_server.qh"
+    #include "defs.qh"
+    #include "vehicles/vehicles_def.qh"
+#endif
 
 .float  roomtype;
 .float  radius;

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

diff --git a/qcsrc/server/t_items.qh b/qcsrc/server/t_items.qh
index 6b0c317c426daa248c9092b109f992c57858f5db..6b3acb064728bdca8ac547ce7e7b6b8317807de8 100644 (file)
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -1,3 +1,103 @@
+#ifndef T_ITEMS_H
+#define T_ITEMS_H
+
+#if defined(CSQC)
+       #include "../common/util-pre.qh"
+       #include "../client/sys-pre.qh"
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "../client/sys-post.qh"
+       #include "../client/Defs.qc"
+       #include "../dpdefs/keycodes.qc"
+       #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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.
@@ -166,3 +266,4 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa
 
 float GiveItems(entity e, float beginarg, float endarg);
 #endif
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 99a58a4b78fb53117614ff290a405627be90fcb1..8bd5a2f1ca3223a4f6819daf960697ef27cd99b4 100644 (file)
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -1,3 +1,19 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "../common/animdecide.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "weapons/csqcprojectile.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+#endif
+
 const float PUSH_ONCE                  = 1;
 const float PUSH_SILENT                = 2;
 

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index c51e5d53ab7dcfacfdf6cf59d768a0f2273aeb1a..c714c69eca4a1173a719aa5d90cb8992f1446943 100644 (file)
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -1,3 +1,23 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../warpzonelib/mathlib.qh"
+    #include "../warpzonelib/common.qh"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/notifications.qh"
+    #include "../common/deathtypes.qh"
+    #include "command/common.qh"
+    #include "../csqcmodellib/sv_model.qh"
+#endif
+
 .float dmgtime2;
 void generic_plat_blocked()
 {

diff --git a/qcsrc/server/t_quake.qc b/qcsrc/server/t_quake.qc
index 219a6ae231162ed9b467ade90f7aa294c78e5f77..e7a3558a59bddc1acc9cd39d7033cad6fb731166 100644 (file)
--- a/qcsrc/server/t_quake.qc
+++ b/qcsrc/server/t_quake.qc
@@ -1,3 +1,9 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../dpdefs/progsdefs.qc"
+#endif
+
 //***********************
 //QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
 //***********************

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 7c1a582879ea5f3a64cc68de0869c075994df2ae..8e7079e07d4bc402b7f2ed6b0516dbce89eaf0b6 100644 (file)
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../common/buffs.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "defs.qh"
+    #include "../common/mapinfo.qh"
+#endif
+
 //***********************
 //QUAKE 3 ENTITIES - So people can play quake3 maps with the xonotic weapons
 //***********************

diff --git a/qcsrc/server/t_swamp.qc b/qcsrc/server/t_swamp.qc
index e481dc6349018f2b28a539d4d3be7594daac9a11..b103e15e1bab0b68e80a4204b95d6b57bdcadd2b 100644 (file)
--- a/qcsrc/server/t_swamp.qc
+++ b/qcsrc/server/t_swamp.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../warpzonelib/util_server.qh"
+    #include "../common/weapons/weapons.qh"
+    #include "defs.qh"
+    #include "../common/deathtypes.qh"
+#endif
+
 /*
 *              t_swamp.c
 *              Adds spawnfunc_trigger_swamp and suppoart routines for xonotic 1.2.1+

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index af72d135af2a6e50a907e1f91360e65d7ae4108e..5143e3fb2b13deaec53cffcf3c62587071f3297b 100644 (file)
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -1,3 +1,24 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../warpzonelib/common.qh"
+    #include "../warpzonelib/util_server.qh"
+    #include "../warpzonelib/server.qh"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "weapons/csqcprojectile.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/deathtypes.qh"
+    #include "tturrets/include/turrets_early.qh"
+    #include "vehicles/vehicles_def.qh"
+    #include "../common/mapinfo.qh"
+    #include "anticheat.qh"
+#endif
+
 void trigger_teleport_use()
 {
        if(teamplay)

diff --git a/qcsrc/server/target_music.qc b/qcsrc/server/target_music.qc
index a806d40bb749a5865a70de63744350355bffc463..da805d5eada21b734b1806f527a50561dafa6aa2 100644 (file)
--- a/qcsrc/server/target_music.qc
+++ b/qcsrc/server/target_music.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../common/constants.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+#endif
+
 .float lifetime;
 // values:
 //   volume

diff --git a/qcsrc/server/target_spawn.qc b/qcsrc/server/target_spawn.qc
index 93d7485bb3f57281f4638708bc5fa302ec2935e2..ec410ff1a13f13489f34b59fb30d40c24c08c852 100644 (file)
--- a/qcsrc/server/target_spawn.qc
+++ b/qcsrc/server/target_spawn.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../common/util.qh"
+    #include "defs.qh"
+#endif
+
 // spawner entity
 // "classname" "target_spawn"
 // "message" "fieldname value fieldname value ..."

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 91eb7cebda3ff9d5a22bc7039551a6ccc22ff844..72e065485d250def25eeb9f43e9a7309b3249fff 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -1,3 +1,23 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "sys-post.qh"
+    #include "../common/constants.qh"
+    #include "../common/teams.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "defs.qh"
+    #include "../common/notifications.qh"
+    #include "../common/deathtypes.qh"
+    #include "mutators/mutators_include.qh"
+    #include "../common/mapinfo.qh"
+    #include "command/vote.qh"
+    #include "scores.qh"
+    #include "race.qh"
+#endif
+
 string cache_mutatormsg;
 string cache_lastmutatormsg;
 

diff --git a/qcsrc/server/tturrets/include/turrets.qh b/qcsrc/server/tturrets/include/turrets.qh
index 60936410d104f054a1329849a94fe1009edee48b..5c9123c1c117c0c29eb3d748ad5141fee5cefbbb 100644 (file)
--- a/qcsrc/server/tturrets/include/turrets.qh
+++ b/qcsrc/server/tturrets/include/turrets.qh
@@ -1,3 +1,89 @@
+#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.qc"
+    #include "../../../dpdefs/dpextensions.qc"
+    #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.
@@ -27,3 +113,4 @@
 //#include "../units/unit_hive.qc"     /// Swarm AI
 
 #endif // TTURRETS_ENABLED
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/tturrets/include/turrets_early.qh b/qcsrc/server/tturrets/include/turrets_early.qh
index 77d7cda9d0ae44b972b182d42a329138040b10c2..92c678620a56cd49a93d0eb0378cbd82d8044869 100644 (file)
--- a/qcsrc/server/tturrets/include/turrets_early.qh
+++ b/qcsrc/server/tturrets/include/turrets_early.qh
@@ -1,3 +1,101 @@
+#ifndef TURRETS_EARLY_H
+#define TURRETS_EARLY_H
+
+#if defined(CSQC)
+    #include "../../../common/util-pre.qh"
+    #include "../../../client/sys-pre.qh"
+    #include "../../../dpdefs/csprogsdefs.qc"
+    #include "../../../client/sys-post.qh"
+    #include "../../../client/Defs.qc"
+    #include "../../../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../../../dpdefs/dpextensions.qc"
+    #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
 
@@ -469,5 +567,4 @@ const int TNSF_ANIM         = 128;
 const int TNSF_FULL_UPDATE  = 16777215;
 
 #endif // TTURRETS_ENABLED
-
-
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/vehicles/bumblebee.qc b/qcsrc/server/vehicles/bumblebee.qc
index 9c1aa461f3471f00095174cdb702914029b2884f..c52896fe8167dfa073b742e525b31d9791361201 100644 (file)
--- a/qcsrc/server/vehicles/bumblebee.qc
+++ b/qcsrc/server/vehicles/bumblebee.qc
@@ -1,3 +1,16 @@
+#if defined(CSQC)
+       #include "../../dpdefs/csprogsdefs.qc"
+       #include "../../client/Defs.qc"
+       #include "../../common/buffs.qh"
+       #include "../../client/damage.qh"
+       #include "../../client/movetypes.qh"
+       #include "../../client/main.qh"
+       #include "../../csqcmodellib/cl_model.qh"
+       #include "../../client/weapons/projectile.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 const float BRG_SETUP = 2;
 const float BRG_START = 4;
 const float BRG_END = 8;

diff --git a/qcsrc/server/vehicles/vehicles.qh b/qcsrc/server/vehicles/vehicles.qh
index 549dfeab7fffcf16b2e33fc48814ff07e330f706..d1b424463013ad19530520dd2cdbb168ec0e9dc6 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qh
+++ b/qcsrc/server/vehicles/vehicles.qh
@@ -1,3 +1,90 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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"
 
@@ -8,3 +95,4 @@
 #include "bumblebee.qc"
 #endif
 #endif
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/vehicles/vehicles_def.qh b/qcsrc/server/vehicles/vehicles_def.qh
index 9c1f0ffd8554309abd532f3c1c6c34f08ace88ba..67270f4672df40d5c3d4bad82ebe06ecacee1347 100644 (file)
--- a/qcsrc/server/vehicles/vehicles_def.qh
+++ b/qcsrc/server/vehicles/vehicles_def.qh
@@ -1,3 +1,59 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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
@@ -71,3 +127,4 @@ void(entity e, vector force, vector force_pos) physics_addforce = #541; // apply
 void(entity e, vector torque) physics_addtorque = #542; // add relative torque
 #endif  // VEHICLES_USE_ODE
 #endif  // VEHICLES_ENABLED
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/waypointsprites.qc b/qcsrc/server/waypointsprites.qc
index 5ba24b448e47985dcee506a13e63ec8adeb7c908..b96306749d7493e63f7296ad0379d73c73f9413c 100644 (file)
--- a/qcsrc/server/waypointsprites.qc
+++ b/qcsrc/server/waypointsprites.qc
@@ -1,3 +1,20 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../common/constants.qh"
+    #include "../common/util.qh"
+    #include "../common/buffs.qh"
+    #include "autocvars.qh"
+    #include "constants.qh"
+    #include "defs.qh"
+    #include "../common/deathtypes.qh"
+    #include "mutators/mutators_include.qh"
+    #include "../common/mapinfo.qh"
+    #include "miscfunctions.qh"
+#endif
+
 ..entity owned_by_field;
 .float rule;
 .string model1;

diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc
index 2c6d918540bdf5b0cda54436a57a993d99b6b261..706b00b5f3945db08b17f87e5897ef80ed07221f 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qc
+++ b/qcsrc/server/weapons/accuracy.qc
@@ -1,3 +1,18 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../common/constants.qh"
+    #include "../../common/util.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "accuracy.qh"
+    #include "../autocvars.qh"
+    #include "../constants.qh"
+    #include "../defs.qh"
+    #include "../mutators/mutators_include.qh"
+#endif
+
 float accuracy_byte(float n, float d)
 {
        //printf("accuracy: %d / %d\n", n, d);

diff --git a/qcsrc/server/weapons/accuracy.qh b/qcsrc/server/weapons/accuracy.qh
index 4cd43ee8addd1aff66c3e4fc921ad323f0876fbc..ed4cec1f40c054383c42079d46aad737558a530b 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qh
+++ b/qcsrc/server/weapons/accuracy.qh
@@ -1,3 +1,41 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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;
 
@@ -23,3 +61,4 @@ void accuracy_add(entity e, float w, float fired, float hit);
 // helper
 float accuracy_isgooddamage(entity attacker, entity targ);
 float accuracy_canbegooddamage(entity attacker);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index 04658b52aabbe593a66c84bf909785c20e9858df..14c80fd4877c2b460ba50eb57e9fc6746b7a8d84 100644 (file)
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -1,3 +1,17 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../common/constants.qh"
+    #include "../../common/util.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "common.qh"
+    #include "../t_items.qh"
+    #include "../autocvars.qh"
+    #include "../defs.qh"
+    #include "../../common/notifications.qh"
+    #include "../../common/deathtypes.qh"
+#endif
 
 void W_GiveWeapon (entity e, float wep)
 {

diff --git a/qcsrc/server/weapons/common.qh b/qcsrc/server/weapons/common.qh
index 8f9454ed541b748d8bdb1350e6def24091c7cb36..7bb2f011a52c1e516046ab891affb6a1e3a945db 100644 (file)
--- a/qcsrc/server/weapons/common.qh
+++ b/qcsrc/server/weapons/common.qh
@@ -1,3 +1,41 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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;
@@ -5,3 +43,4 @@ void W_GiveWeapon (entity e, float wep);
 void W_PlayStrengthSound(entity player);
 float W_CheckProjectileDamage(entity inflictor, entity projowner, float deathtype, float exception);
 void W_PrepareExplosionByDamage(entity attacker, void() explode);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc
index bf09e158585fc630ef23047cff14c91cf79a312c..3a1072ef8b37d83c5382429a951b8f483d655114 100644 (file)
--- a/qcsrc/server/weapons/csqcprojectile.qc
+++ b/qcsrc/server/weapons/csqcprojectile.qc
@@ -1,3 +1,16 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../common/constants.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "csqcprojectile.qh"
+    #include "../t_items.qh"
+    #include "../constants.qh"
+    #include "../defs.qh"
+    #include "../command/common.qh"
+#endif
+
 .float csqcprojectile_type;
 
 float CSQCProjectile_SendEntity(entity to, float sf)

diff --git a/qcsrc/server/weapons/csqcprojectile.qh b/qcsrc/server/weapons/csqcprojectile.qh
index e00c0988b9d8c058b1d2b277048b3edbd7d2dd38..e1f9c41c1896f83d93b5898090deaddf075a71c0 100644 (file)
--- a/qcsrc/server/weapons/csqcprojectile.qh
+++ b/qcsrc/server/weapons/csqcprojectile.qh
@@ -1,6 +1,47 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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);
 void UpdateCSQCProjectile(entity e);
 void UpdateCSQCProjectileAfterTeleport(entity e);
 void CSQCProjectile_Check(entity e);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc
index 226601e8561544388cbaeb5dccb55c541d794449..ace69b6721402710ec76c5b7388c60320fab59f2 100644 (file)
--- a/qcsrc/server/weapons/hitplot.qc
+++ b/qcsrc/server/weapons/hitplot.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../common/weapons/weapons.qh"
+    #include "hitplot.qh"
+    #include "../autocvars.qh"
+    #include "../defs.qh"
+    #include "../antilag.qh"
+#endif
+
 vector W_HitPlotUnnormalizedUntransform(vector screenforward, vector screenright, vector screenup, vector v)
 {
        vector ret;

diff --git a/qcsrc/server/weapons/hitplot.qh b/qcsrc/server/weapons/hitplot.qh
index 9bc8ff30394233183872630df7f5ba5176996a6e..01c2e8cc9efd1567447347dd70749578c8e073c2 100644 (file)
--- a/qcsrc/server/weapons/hitplot.qh
+++ b/qcsrc/server/weapons/hitplot.qh
@@ -1,5 +1,47 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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);
 void W_HitPlotOpen(entity player);
 void W_HitPlotClose(entity player);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc
index 8ec11925f2cb9bd983453287c1cbbdc2f115dd42..6a625700cd15cb7bf2e792656dc03670258437f9 100644 (file)
--- a/qcsrc/server/weapons/selection.qc
+++ b/qcsrc/server/weapons/selection.qc
@@ -1,3 +1,18 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../common/constants.qh"
+    #include "../../common/util.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "selection.qh"
+    #include "weaponsystem.qh"
+    #include "../t_items.qh"
+    #include "../autocvars.qh"
+    #include "../defs.qh"
+#endif
+
 // switch between weapons
 void Send_WeaponComplain(entity e, float wpn, float type)
 {

diff --git a/qcsrc/server/weapons/selection.qh b/qcsrc/server/weapons/selection.qh
index 0c9aeefb3db77278b69cf597c416e769b34f8471..f36d6d487bdf5f9c6175817711c3a093ad11ef0c 100644 (file)
--- a/qcsrc/server/weapons/selection.qh
+++ b/qcsrc/server/weapons/selection.qh
@@ -1,3 +1,45 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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);
 
@@ -27,3 +69,4 @@ void W_PreviousWeapon(float list);
 
 // previously used if exists and has ammo, (second) best otherwise
 void W_LastWeapon(void);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index f13b2860875cf21ca873e42551909aa1d5ad8ade..6d21022d3d91595ab0c9d42abb5d3d06e307d05d 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,3 +1,19 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../sys-post.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "spawning.qh"
+    #include "weaponsystem.qh"
+    #include "../t_items.qh"
+    #include "../autocvars.qh"
+    #include "../constants.qh"
+    #include "../defs.qh"
+    #include "../mutators/mutators_include.qh"
+#endif
+
 string W_Apply_Weaponreplace(string in)
 {
        float n = tokenize_console(in);

diff --git a/qcsrc/server/weapons/spawning.qh b/qcsrc/server/weapons/spawning.qh
index c6939e53af268a791e88f29411190442f46e24cb..50e95896f138fd41f00a864714c21789c909450c 100644 (file)
--- a/qcsrc/server/weapons/spawning.qh
+++ b/qcsrc/server/weapons/spawning.qh
@@ -1,3 +1,47 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 411ab92bede55ee3725f571e17df0889bd1618ec..743cb8d560adafc8e4544289b5fd376156e60717 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -1,3 +1,21 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../common/util.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "throwing.qh"
+    #include "weaponsystem.qh"
+    #include "../t_items.qh"
+    #include "../autocvars.qh"
+    #include "../constants.qh"
+    #include "../defs.qh"
+    #include "../../common/notifications.qh"
+    #include "../mutators/mutators_include.qh"
+    #include "../../common/mapinfo.qh"
+#endif
+
 void thrown_wep_think()
 {
        self.nextthink = time;

diff --git a/qcsrc/server/weapons/throwing.qh b/qcsrc/server/weapons/throwing.qh
index c09a8f88296c4da90d6743e686d960513f5692be..b5d9ca0547088abb8435340a34ec69d1a4f0030b 100644 (file)
--- a/qcsrc/server/weapons/throwing.qh
+++ b/qcsrc/server/weapons/throwing.qh
@@ -1,3 +1,47 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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();
 
@@ -10,3 +54,4 @@ float W_IsWeaponThrowable(float w);
 void W_ThrowWeapon(vector velo, vector delta, float doreduce);
 
 void SpawnThrownWeapon(vector org, float w);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index c4dbe9f84ec06bf93e6ee5f18bd30a0032c5fee4..16937cf688cde4091688c1ebcf91cc2903f539cf 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -1,3 +1,18 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../../warpzonelib/common.qh"
+    #include "../../common/constants.qh"
+    #include "../../common/util.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "tracing.qh"
+    #include "../autocvars.qh"
+    #include "../defs.qh"
+    #include "../antilag.qh"
+#endif
+
 // this function calculates w_shotorg and w_shotdir based on the weapon model
 // offset, trueaim and antilag, and won't put w_shotorg inside a wall.
 // make sure you call makevectors first (FIXME?)

diff --git a/qcsrc/server/weapons/tracing.qh b/qcsrc/server/weapons/tracing.qh
index ce8511ba38feb311fb9e28906c36dd2d586942c9..2f31f94439de94a33ab8526122dff60f8603dad8 100644 (file)
--- a/qcsrc/server/weapons/tracing.qh
+++ b/qcsrc/server/weapons/tracing.qh
@@ -1,3 +1,48 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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;
@@ -53,3 +98,4 @@ float fireBullet_trace_callback_eff;
 entity fireBullet_last_hit;
 void fireBullet_trace_callback(vector start, vector hit, vector end);
 void fireBullet(vector start, vector dir, float spread, float max_solid_penetration, float damage, float force, float dtype, float tracereffects);
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/weapons/weaponstats.qc b/qcsrc/server/weapons/weaponstats.qc
index c0ccff0b93433f06739f81420f98ecfde16ba611..744d035ee70c2071b7af8635c01dc823a92102de 100644 (file)
--- a/qcsrc/server/weapons/weaponstats.qc
+++ b/qcsrc/server/weapons/weaponstats.qc
@@ -1,3 +1,15 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+       #include "../../dpdefs/dpextensions.qc"
+       #include "../../common/urllib.qh"
+       #include "../../common/weapons/weapons.qh"
+       #include "weaponstats.qh"
+       #include "../autocvars.qh"
+       #include "../defs.qh"
+#endif
+
 void WeaponStats_Init()
 {
        weaponstats_buffer = ((autocvar_sv_weaponstats_file != "") ? buf_create() : -1);

diff --git a/qcsrc/server/weapons/weaponstats.qh b/qcsrc/server/weapons/weaponstats.qh
index 08ae8dd0a53f56e5ba5bf19efc7f131057eec7d0..0dc79146f8361f6afba2ba7a1558f7dff3439dd0 100644 (file)
--- a/qcsrc/server/weapons/weaponstats.qh
+++ b/qcsrc/server/weapons/weaponstats.qh
@@ -1,3 +1,49 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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();
@@ -8,3 +54,4 @@ void WeaponStats_LogDamage(float awep, float abot, float vwep, float vbot, float
 void WeaponStats_LogKill(float awep, float abot, float vwep, float vbot);
 
 #define WEAPONSTATS_GETINDEX(awep,abot,vwep,vbot) (((vwep) + (awep) * (WEP_LAST - WEP_FIRST + 1) - (WEP_FIRST + WEP_FIRST * (WEP_LAST - WEP_FIRST + 1))) * 4 + (abot) * 2 + (vbot))
+#endif
\ No newline at end of file

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 07558aad118d9c231600392803cd6e92e659c424..f3c5306e69d98f6e2a4feebeb336f2f0666d8260 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -1,3 +1,25 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../../dpdefs/progsdefs.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #include "../sys-post.qh"
+    #include "../../common/constants.qh"
+    #include "../../common/util.qh"
+    #include "../../common/animdecide.qh"
+    #include "../../common/monsters/monsters.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "weaponsystem.qh"
+    #include "../t_items.qh"
+    #include "../autocvars.qh"
+    #include "../defs.qh"
+    #include "../../common/notifications.qh"
+    #include "../mutators/mutators_include.qh"
+    #include "../command/common.qh"
+    #include "../../csqcmodellib/sv_model.qh"
+    #include "../round_handler.qh"
+#endif
+
 /*
 ===========================================================================
 

diff --git a/qcsrc/server/weapons/weaponsystem.qh b/qcsrc/server/weapons/weaponsystem.qh
index ddb1ee69588aa578c3394b427fa158eb27ab7a96..81e2d6089960e14f2696764300a9d5ce40ceb5d2 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qh
+++ b/qcsrc/server/weapons/weaponsystem.qh
@@ -1,6 +1,54 @@
+#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.qc"
+    #include "../../dpdefs/dpextensions.qc"
+    #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;
 
 void W_DropEvent(float event, entity player, float weapon_type, entity weapon_item);
 
 float forbidWeaponUse();
+#endif
\ No newline at end of file

diff --git a/qcsrc/warpzonelib/anglestransform.qc b/qcsrc/warpzonelib/anglestransform.qc
index b4ff61d9e2afa02a4261e364e9745b15f15bf1b5..bb10e564e56ff2ac11341631d6f6a6778fd74e7d 100644 (file)
--- a/qcsrc/warpzonelib/anglestransform.qc
+++ b/qcsrc/warpzonelib/anglestransform.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "anglestransform.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "anglestransform.qh"
+#endif
+
 #ifdef POSITIVE_PITCH_IS_DOWN
 vector fixedvectoangles(vector a)
 {

diff --git a/qcsrc/warpzonelib/anglestransform.qh b/qcsrc/warpzonelib/anglestransform.qh
index b1c8a85e9da5916983322a5fad1016216e3250d1..1e2e671e1f9e893becf0098314f5e37256924ea3 100644 (file)
--- a/qcsrc/warpzonelib/anglestransform.qh
+++ b/qcsrc/warpzonelib/anglestransform.qh
@@ -1,3 +1,24 @@
+#ifndef ANGLETRANSFORM_H
+#define ANGLETRANSFORM_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../server/sys-post.qh"
+#endif
+
 #define POSITIVE_PITCH_IS_DOWN
 
 #ifdef POSITIVE_PITCH_IS_DOWN
@@ -30,3 +51,4 @@ vector AnglesTransform_ToVAngles(vector v);
 // transformed = original * transform + postshift
 vector AnglesTransform_Multiply_GetPostShift(vector sf0, vector st0, vector t1, vector st1);
 vector AnglesTransform_PrePostShift_GetPostShift(vector sf, vector t, vector st);
+#endif
\ No newline at end of file

diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index 85aba53fcc4d9463980b2b5da0d246021f1d911c..7b9ac0c095e78f576f672cc91d7b08f2d7384fe0 100644 (file)
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+       #include "common.qh"
+       #include "client.qh"
+       #include "../client/autocvars.qh"
+       #include "../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 void WarpZone_Fade_PreDraw()
 {
        vector org;

diff --git a/qcsrc/warpzonelib/client.qh b/qcsrc/warpzonelib/client.qh
index c0a4ca0f0a70d07caebd9fa4d86aef57db98dbc9..f8f13bfcfeca1b4de81b3242c0c3c57d91906204 100644 (file)
--- a/qcsrc/warpzonelib/client.qh
+++ b/qcsrc/warpzonelib/client.qh
@@ -1,3 +1,22 @@
+#ifndef CLIENT_H
+#define CLIENT_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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);
@@ -10,3 +29,4 @@ void WarpZone_Shutdown();
 
 vector warpzone_save_view_origin;
 vector warpzone_save_view_angles;
+#endif
\ No newline at end of file

diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc
index 146fdfb834d98ac83e141b8d1c9ed44e1f6e42d9..683b3e3b9a96495bf901be082e95188cd97aef8d 100644 (file)
--- a/qcsrc/warpzonelib/common.qc
+++ b/qcsrc/warpzonelib/common.qc
@@ -1,3 +1,16 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+    #include "common.qh"
+    #include "../server/t_items.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../server/sys-post.qh"
+    #include "common.qh"
+    #include "../common/weapons/weapons.qh"
+#endif
+
 void WarpZone_Accumulator_Clear(entity acc)
 {
        acc.warpzone_transform = '0 0 0';

diff --git a/qcsrc/warpzonelib/common.qh b/qcsrc/warpzonelib/common.qh
index c79ee95d6e02d2d2062b8a35a987de07f0aca3cb..6c71ce91a4cc68ee7a6031b71cb8f8da4125d90d 100644 (file)
--- a/qcsrc/warpzonelib/common.qh
+++ b/qcsrc/warpzonelib/common.qh
@@ -1,3 +1,28 @@
+#ifndef WARPZONELIB_COMMON_H
+#define WARPZONELIB_COMMON_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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
 
@@ -100,3 +125,4 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me); // spawn().R = me.R
 #ifndef BITXOR_ASSIGN
 # define BITXOR_ASSIGN(a,b) ((a) = ((a) | (b)) - ((a) & (b)))
 #endif
+#endif
\ No newline at end of file

diff --git a/qcsrc/warpzonelib/mathlib.qc b/qcsrc/warpzonelib/mathlib.qc
index a4421e85f5dcb28deb9d35472c52b3a26afee516..5ec65def59a67e9b25a4d409a6426e7150f8af27 100644 (file)
--- a/qcsrc/warpzonelib/mathlib.qc
+++ b/qcsrc/warpzonelib/mathlib.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qc"
+    #include "mathlib.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "mathlib.qh"
+#endif
+
 int fpclassify(float x)
 {
        if(isnan(x))

diff --git a/qcsrc/warpzonelib/mathlib.qh b/qcsrc/warpzonelib/mathlib.qh
index 8b1569221563f6f024f67670b16e87816c439331..2de42c6056fdfdcc71f7529eb3f3bbc3e02878dc 100644 (file)
--- a/qcsrc/warpzonelib/mathlib.qh
+++ b/qcsrc/warpzonelib/mathlib.qh
@@ -1,3 +1,32 @@
+#ifndef MATHLIB_H
+#define MATHLIB_H
+
+#if defined(CSQC)
+    #include "../common/util-pre.qh"
+    #include "../client/sys-pre.qh"
+    #include "../dpdefs/csprogsdefs.qc"
+    #include "../client/sys-post.qh"
+    #include "../client/Defs.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/keycodes.qc"
+    #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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "../server/sys-post.qh"
+    #include "anglestransform.qh"
+#endif
+
 // <math.h>
 
 // The commented-out functions need no implementation because DarkPlaces offers
@@ -98,3 +127,4 @@ const float M_2_PI     = 0.63661977236758134308;  /* 2/pi */
 const float M_2_SQRTPI = 1.12837916709551257390;  /* 2/sqrt(pi) */
 const float M_SQRT2    = 1.41421356237309504880;  /* sqrt(2) */
 const float M_SQRT1_2  = 0.70710678118654752440;  /* 1/sqrt(2) */
+#endif
\ No newline at end of file

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index 3f14b9097a37b7e282003acf54683b61268d7004..06af2fdfc87cb8af88eb43cb77b5b73cdb175b86 100644 (file)
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -1,3 +1,17 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+       #include "../dpdefs/dpextensions.qc"
+       #include "common.qh"
+       #include "server.qh"
+       #include "../common/constants.qh"
+       #include "../common/util.qh"
+       #include "../server/constants.qh"
+       #include "../server/defs.qh"
+       #include "../server/command/common.qh"
+#endif
+
 #ifdef WARPZONELIB_KEEPDEBUG
 #define WARPZONELIB_REMOVEHACK
 #endif

diff --git a/qcsrc/warpzonelib/server.qh b/qcsrc/warpzonelib/server.qh
index 3c09ea770a8a9267e15b94da0aae62da99c8ec82..5cf781d58281abc74b1ce214ff60e9783680d2bd 100644 (file)
--- a/qcsrc/warpzonelib/server.qh
+++ b/qcsrc/warpzonelib/server.qh
@@ -1,3 +1,20 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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();
 
@@ -12,3 +29,4 @@ float WarpZone_Projectile_Touch_ImpactFilter_Callback();
 void WarpZone_PlayerPhysics_FixVAngle(void);
 
 void WarpZone_PostInitialize_Callback(void);
+#endif
\ No newline at end of file

diff --git a/qcsrc/warpzonelib/util_server.qc b/qcsrc/warpzonelib/util_server.qc
index 8beea9c7642032737377fbf89ef6c356c8f34cd9..10a7a2ffbea2d8ea3cbfee7c1544f241db7c9b6b 100644 (file)
--- a/qcsrc/warpzonelib/util_server.qc
+++ b/qcsrc/warpzonelib/util_server.qc
@@ -1,3 +1,13 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #include "common.qh"
+    #include "util_server.qh"
+    #include "../csqcmodellib/sv_model.qh"
+#endif
+
 void WarpZoneLib_MoveOutOfSolid_Expand(entity e, vector by)
 {
        float eps = 0.0625;

diff --git a/qcsrc/warpzonelib/util_server.qh b/qcsrc/warpzonelib/util_server.qh
index cd5af7fb4ccb24bea3e665d5b59a03e6bdd5cd59..9e29fe0259cf5c6d7af70771d144b991a8cf3f96 100644 (file)
--- a/qcsrc/warpzonelib/util_server.qh
+++ b/qcsrc/warpzonelib/util_server.qh
@@ -1,3 +1,20 @@
+#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.qc"
+    #include "../dpdefs/dpextensions.qc"
+    #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();
+#endif
\ No newline at end of file