#includes: cleanup server

diff --git a/qcsrc/client/commands/all.qc b/qcsrc/client/commands/all.qc
index dcace65938aeb378ad000adc5bdfcbbad81dca24..45d9eaaa806218e74144938741a7c5eb36f46320 100644 (file)
--- a/qcsrc/client/commands/all.qc
+++ b/qcsrc/client/commands/all.qc
@@ -1,5 +1,3 @@
-#include "../_all.qh"
-
 #include "../../common/command/all.qc"
 
 #include "cl_cmd.qc"

diff --git a/qcsrc/client/csqc_constants.qh b/qcsrc/client/csqc_constants.qh
index 1df447283ce680b5639f85a5f9777b19a03163c3..584f001f88ad0b9763658c1fce02d4eaed3006e3 100644 (file)
--- a/qcsrc/client/csqc_constants.qh
+++ b/qcsrc/client/csqc_constants.qh
@@ -1,9 +1,6 @@
 #ifndef CLIENT_CSQC_CONSTANTS
 #define CLIENT_CSQC_CONSTANTS
 
-// MenuQC redefines world, change define it here to be safe
-#define world world
-
 // Mask Constants (set .drawmask on entities; use R_AddEntities to add all entities based on mask)
 const int              MASK_ENGINE                                             = 1;
 const int              MASK_ENGINEVIEWMODELS                   = 2;

diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh
index 0a78b7772292bbb884b9fce938b6a5b384375c0c..84253b1e985fcf19c226d74a078dfa28489c580d 100644 (file)
--- a/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@ -1,6 +1,17 @@
 #ifndef MONSTER_H
 #define MONSTER_H
 
+#ifdef SVQC
+#include "sv_monsters.qh"
+#include "../../server/g_damage.qh"
+#include "../../server/bot/bot.qh"
+#include "../../server/weapons/common.qh"
+#include "../../server/weapons/tracing.qh"
+#include "../../server/weapons/weaponsystem.qh"
+#include "../mutators/mutator/waypoints/waypointsprites.qh"
+#include "../../warpzonelib/server.qh"
+#endif
+
 // special spawn flags
 const int MONSTER_RESPAWN_DEATHPOINT = 16; // re-spawn where we died
 const int MONSTER_TYPE_FLY = 32;

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index 9952063f60133e5fe4845ffd5f76e66ae7065d30..fd1c9bb85212d136bcee44aebabbad3cb8c1e3f1 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -23,6 +23,7 @@ REGISTER_MONSTER(MAGE, NEW(Mage)) {
 }
 
 #include "../../weapons/all.qh"
+#include "../../items/all.qc"
 
 CLASS(MageSpike, PortoLaunch)
 /* flags     */ ATTRIB(MageSpike, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
@@ -162,6 +163,8 @@ void M_Mage_Attack_Spike_Touch()
        M_Mage_Attack_Spike_Explode();
 }
 
+.float wait;
+
 // copied from W_Seeker_Think
 void M_Mage_Attack_Spike_Think()
 {SELFPARAM();
@@ -460,6 +463,8 @@ spawnfunc(monster_mage) { Monster_Spawn(MON_MAGE.monsterid); }
                }
                #endif
                #ifdef SVQC
+               .float speed;
+               spawnfunc(item_health_large);
                METHOD(Mage, mr_setup, bool(Monster thismon))
                {
                        SELFPARAM();

diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc
index 937c83c9edbe868b7f2f3c25f5d3d4caaab628cf..30e0fe428e4cef803c64f516ac46dd9739b843fd 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -82,6 +82,8 @@ void M_Shambler_Attack_Swing()
        }
 }
 
+#include "../../../server/csqceffects.qh"
+
 void M_Shambler_Attack_Lightning_Explode()
 {SELFPARAM();
        entity head;
@@ -179,6 +181,8 @@ void M_Shambler_Attack_Lightning()
        CSQCProjectile(gren, true, PROJECTILE_SHAMBLER_LIGHTNING, true);
 }
 
+.int state;
+
 float M_Shambler_Attack(float attack_type, entity targ)
 {SELFPARAM();
        switch(attack_type)
@@ -263,6 +267,8 @@ spawnfunc(monster_shambler) { Monster_Spawn(MON_SHAMBLER.monsterid); }
                }
                #endif
                #ifdef SVQC
+               spawnfunc(item_health_mega);
+               .float animstate_endtime;
                METHOD(Shambler, mr_setup, bool(Shambler thismon))
                {
                        SELFPARAM();

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index 35a320b9d50908b6209927e604db3f6004f57397..93252a39a2cf03463a26e4e22659efbaaaadcad6 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -113,6 +113,8 @@ void M_Spider_Attack_Web_Touch()
        M_Spider_Attack_Web_Explode();
 }
 
+void adaptor_think2use_hittype_splash();
+
 void M_Spider_Attack_Web()
 {SELFPARAM();
        monster_makevectors(self.enemy);
@@ -206,6 +208,7 @@ spawnfunc(monster_spider) { Monster_Spawn(MON_SPIDER.monsterid); }
                }
                #endif
                #ifdef SVQC
+               spawnfunc(item_health_medium);
                METHOD(Spider, mr_setup, bool(Spider thismon))
                {
                        SELFPARAM();

diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc
index 102fd6a5c1fdfb1aa4a58bcc320c195f645ce03f..4acf2093b6867c898b47bbfaacaaba5c7c85d12b 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qc
+++ b/qcsrc/common/monsters/monster/wyvern.qc
@@ -177,6 +177,7 @@ spawnfunc(monster_wyvern) { Monster_Spawn(MON_WYVERN.monsterid); }
                }
                #endif
                #ifdef SVQC
+               spawnfunc(item_cells);
                METHOD(Wyvern, mr_setup, bool(Wyvern thismon))
                {
                        SELFPARAM();

diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc
index 8425a123add60d29469b219c2d0f3b191a34b7de..2300f78f61c19a1771a81722020e462822617b45 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qc
+++ b/qcsrc/common/monsters/monster/zombie.qc
@@ -73,6 +73,8 @@ const float zombie_anim_runforwardright               = 29;
 const float zombie_anim_spawn                          = 30;
 */
 
+.vector moveto;
+
 void M_Zombie_Attack_Leap_Touch()
 {SELFPARAM();
        if (self.health <= 0)

diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh
index d1d224363d314dc52e59199c3f794c7e34b60830..acf94eb7d78ad9f35b80ed1d9777cc0292889439 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qh
+++ b/qcsrc/common/monsters/sv_monsters.qh
@@ -94,6 +94,9 @@ void monster_makevectors(entity e);
 
 void Monster_Sound(.string samplefield, float sound_delay, float delaytoo, float chan);
 
+/** number of monsters spawned with mobspawn command */
+int totalspawned;
+
 // monster sounds
 .float msound_delay; // temporary antilag system
 #define ALLMONSTERSOUNDS \

diff --git a/qcsrc/common/triggers/func/breakable.qc b/qcsrc/common/triggers/func/breakable.qc
index af9a6b4233124190ad4ab1a417d8f6562739190b..a0d266ce51b22f9388d696ee13823633845209f9 100644 (file)
--- a/qcsrc/common/triggers/func/breakable.qc
+++ b/qcsrc/common/triggers/func/breakable.qc
@@ -1,7 +1,5 @@
 #ifdef SVQC
 
-#include "../../../server/_all.qh"
-
 #include "../../../server/g_subs.qh"
 #include "../../../server/g_damage.qh"
 #include "../../../server/bot/bot.qh"

diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc
index 3b9996db6daea61a447dfa6005827d9f2cb1ff00..cc15516d1d14e067e3ef7c5e08c72c4427fd18a1 100644 (file)
--- a/qcsrc/common/triggers/misc/laser.qc
+++ b/qcsrc/common/triggers/misc/laser.qc
@@ -1,5 +1,4 @@
 #if defined(CSQC)
-       #include "../../../client/_all.qh"
        #include "../../buffs/all.qh"
        #include "../../../csqcmodellib/interpolate.qh"
        #include "../../../client/main.qh"

diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc
index 41edbb718740193adce9252fbdc55666c64c6d6d..257de8be5708c52bf2a11e1410f7173a179fa53a 100644 (file)
--- a/qcsrc/common/triggers/target/music.qc
+++ b/qcsrc/common/triggers/target/music.qc
@@ -1,7 +1,6 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../../server/_all.qh"
     #include "../../constants.qh"
     #include "../../../server/constants.qh"
     #include "../../../server/defs.qh"

diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/triggers/target/spawn.qc
index 10fe3c764afb24b3152cd052346cecc2457b7e42..b95837127f3b9b18ecb262643d66ed94d0cce10d 100644 (file)
--- a/qcsrc/common/triggers/target/spawn.qc
+++ b/qcsrc/common/triggers/target/spawn.qc
@@ -1,7 +1,6 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../../server/_all.qh"
     #include "../../util.qh"
     #include "../../../server/defs.qh"
 #endif

diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc
index 94f2bd26bc99b897a88a45002f27a6a83a7b3f78..438292a438690a3bc83f66edcdcfab182f6d4fab 100644 (file)
--- a/qcsrc/common/triggers/teleporters.qc
+++ b/qcsrc/common/triggers/teleporters.qc
@@ -3,7 +3,6 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../server/_all.qh"
     #include "../../warpzonelib/common.qh"
     #include "../../warpzonelib/util_server.qh"
     #include "../../warpzonelib/server.qh"

diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index a5482402891c433fec98f9ebc0f1b2b797af8559..931ff9ceece98d0492268f51316efd4a3c1fe9f1 100644 (file)
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -1,6 +1,5 @@
 // TODO: split target_push and put it in the target folder
 #ifdef SVQC
-#include "../../../server/_all.qh"
 #include "jumppads.qh"
 #include "../../movetypes/movetypes.qh"
 

diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/triggers/trigger/secret.qc
index d16d2773c193442fe04b83943e47b7c9ad8a5652..285ba62a937567c807b57d60f5362ececfcd85c1 100644 (file)
--- a/qcsrc/common/triggers/trigger/secret.qc
+++ b/qcsrc/common/triggers/trigger/secret.qc
@@ -1,7 +1,6 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../../server/_all.qh"
     #include "../../util.qh"
     #include "../../../server/defs.qh"
     #include "secret.qh"

diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc
index 2ae068d824f648bd3a98c776a708fbd23e1c018a..029ee9630db8c90c2dcee037a7b759b7ff93c27c 100644 (file)
--- a/qcsrc/common/triggers/trigger/swamp.qc
+++ b/qcsrc/common/triggers/trigger/swamp.qc
@@ -1,7 +1,6 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../../server/_all.qh"
     #include "../../../warpzonelib/util_server.qh"
     #include "../../weapons/all.qh"
     #include "../../../server/defs.qh"

diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc
index 4f750cdb4d48a5cc13d152c1decfd9b0d04a0257..07ea9091dc3f605f0bb56b7c759285480a432aeb 100644 (file)
--- a/qcsrc/server/bot/aim.qc
+++ b/qcsrc/server/bot/aim.qc
@@ -1,8 +1,9 @@
 #include "aim.qh"
-#include "../_all.qh"
 
 #include "bot.qh"
 
+#include "../weapons/weaponsystem.qh"
+
 #include "../mutators/mutators_include.qh"
 
 // traces multiple trajectories to find one that will impact the target

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index c033daeecebead6955d18eabdddb2ae2b108e7a9..dbcd900525b0e010c81d1c48a42941527da53738 100644 (file)
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -1,5 +1,4 @@
 #include "bot.qh"
-#include "../_all.qh"
 
 #include "aim.qh"
 #include "navigation.qh"
@@ -9,6 +8,8 @@
 #include "havocbot/havocbot.qh"
 #include "havocbot/scripting.qh"
 
+#include "../teamplay.qh"
+
 #include "../antilag.qh"
 #include "../autocvars.qh"
 #include "../campaign.qh"

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index f69527916ce512ad8c3d94ac61e798883716f459..ec27e3e94c3d49348259bff64a61c70344c12c56 100644 (file)
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -1,5 +1,4 @@
 #include "havocbot.qh"
-#include "../../_all.qh"
 
 #include "../aim.qh"
 #include "../bot.qh"
@@ -8,11 +7,14 @@
 #include "../waypoints.qh"
 
 #include "../../../common/constants.qh"
+#include "../../../common/items/all.qh"
 
 #include "../../../common/triggers/trigger/jumppads.qh"
 
 #include "../../../warpzonelib/common.qh"
 
+.float speed;
+
 void havocbot_ai()
 {SELFPARAM();
        if(self.draggedby)

diff --git a/qcsrc/server/bot/havocbot/role_keyhunt.qc b/qcsrc/server/bot/havocbot/role_keyhunt.qc
index b1603c792ac033806577bcd189016cac89040674..0059dc97a3d64a807d9a5837b89ca0666ded7df6 100644 (file)
--- a/qcsrc/server/bot/havocbot/role_keyhunt.qc
+++ b/qcsrc/server/bot/havocbot/role_keyhunt.qc
@@ -1,5 +1,4 @@
 #include "role_keyhunt.qh"
-#include "../../_all.qh"
 
 #include "havocbot.qh"
 

diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc
index 037968f1367b30205fbeccad9ce569e401dcbb7d..a4357628eee88d6ae646e450f733e64f9363bd9c 100644 (file)
--- a/qcsrc/server/bot/havocbot/roles.qc
+++ b/qcsrc/server/bot/havocbot/roles.qc
@@ -1,4 +1,3 @@
-#include "../../_all.qh"
 
 #include "havocbot.qh"
 #include "role_keyhunt.qh"

diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc
index 99e3901b2b3cb095b771a89286c9b5ac1bcae721..36171eddffb329ac84dc26fcad32b6cbffb750a4 100644 (file)
--- a/qcsrc/server/bot/navigation.qc
+++ b/qcsrc/server/bot/navigation.qc
@@ -1,14 +1,17 @@
 #include "navigation.qh"
-#include "../_all.qh"
 
 #include "bot.qh"
 #include "waypoints.qh"
 
 #include "../t_items.qh"
 
+#include "../../common/items/all.qh"
+
 #include "../../common/constants.qh"
 #include "../../common/triggers/trigger/jumppads.qh"
 
+.float speed;
+
 void bot_debug(string input)
 {
        switch(autocvar_bot_debug)

diff --git a/qcsrc/server/bot/scripting.qc b/qcsrc/server/bot/scripting.qc
index 72951cd6628b36e574d77b98abac0b2bfd2d6a0b..c3484e1d4c47e9c4bc1dc7753630dada4104b309 100644 (file)
--- a/qcsrc/server/bot/scripting.qc
+++ b/qcsrc/server/bot/scripting.qc
@@ -1,8 +1,9 @@
 #include "scripting.qh"
-#include "../_all.qh"
 
 #include "bot.qh"
 
+.int state;
+
 .float bot_cmdqueuebuf_allocated;
 .float bot_cmdqueuebuf;
 .float bot_cmdqueuebuf_start;

diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc
index 8f50d0276a6efb67158ba9164649edbdec387c70..ffd78e93167a7c9dfed604ba32c97cf853fbde84 100644 (file)
--- a/qcsrc/server/bot/waypoints.qc
+++ b/qcsrc/server/bot/waypoints.qc
@@ -1,5 +1,4 @@
 #include "waypoints.qh"
-#include "../_all.qh"
 
 #include "bot.qh"
 #include "navigation.qh"
@@ -8,6 +7,7 @@
 
 #include "../../common/constants.qh"
 
+#include "../../warpzonelib/common.qh"
 #include "../../warpzonelib/util_server.qh"
 
 // create a new spawnfunc_waypoint and automatically link it to other waypoints, and link

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index aa87763ca360441eb5268efca18ed2eb922c3818..c17a1d0c8868dd46b5cc07c7c9107157dcead702 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -1,5 +1,4 @@
 #include "cheats.qh"
-#include "_all.qh"
 
 #include "g_damage.qh"
 #include "race.qh"

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 71efa5f9d931233f32899305692f023ceaea5d96..ad0d71db3521e3b17f1af8bd235b6f181204021b 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -24,6 +24,7 @@
 #include "bot/navigation.qh"
 
 #include "../common/vehicles/all.qh"
+#include "../common/triggers/teleporters.qh"
 
 #include "weapons/hitplot.qh"
 #include "weapons/weaponsystem.qh"

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index a594c83c7c93b72876eb6fc3a24f6a47342945e3..8b36e17531c6a221d70d8ca2fa088b12b29c5f00 100644 (file)
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -1,4 +1,3 @@
-#include "_all.qh"
 #include "round_handler.qh"
 
 #include "bot/waypoints.qh"
@@ -14,8 +13,13 @@
 #include "../common/minigames/sv_minigames.qh"
 
 #include "../common/weapons/all.qh"
+#include "../common/vehicles/sv_vehicles.qh"
 
-/*
+#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
+
+.entity vehicle;
+
+/**
  * Impulse map:
  *
  * 0 reserved (no input)

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index e94ba628323711d0b469eaa0af9ba060788ebdfd..13d7b6227636a771877bdd88e870c4f2c856702a 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -1,5 +1,4 @@
 #include "cl_player.qh"
-#include "_all.qh"
 
 #include "bot/bot.qh"
 #include "cheats.qh"
@@ -20,6 +19,9 @@
 
 #include "../common/minigames/sv_minigames.qh"
 
+#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
+#include "../common/triggers/include.qh"
+
 #include "weapons/weaponstats.qh"
 
 #include "../common/animdecide.qh"

diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc
index add929004c0cece3df6467b8f2ec64e931acbea8..f325dcd72c336c5f5c1ebfb86daec0802b968967 100644 (file)
--- a/qcsrc/server/command/banning.qc
+++ b/qcsrc/server/command/banning.qc
@@ -1,6 +1,5 @@
 #include "../../common/command/command.qh"
 #include "banning.qh"
-#include "../_all.qh"
 
 #include "common.qh"
 

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index f849deb6a878119056aca16a3cfe81fd1995c89e..9cf020d338821d0f9b683b056e18a20daf8be83a 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -1,6 +1,5 @@
 #include "../../common/command/command.qh"
 #include "cmd.qh"
-#include "../_all.qh"
 
 #include "common.qh"
 #include "vote.qh"
@@ -23,8 +22,12 @@
 #include "../../common/deathtypes.qh"
 #include "../../common/mapinfo.qh"
 #include "../../common/notifications.qh"
+#include "../../common/physics.qh"
 #include "../../common/teams.qh"
 #include "../../common/util.qh"
+#include "../../common/triggers/triggers.qh"
+
+#include "../../common/minigames/sv_minigames.qh"
 
 #include "../../common/monsters/all.qc"
 #include "../../common/monsters/spawn.qh"

diff --git a/qcsrc/server/command/cmd.qh b/qcsrc/server/command/cmd.qh
index 0e04ce781cb2da5f570e192a614e5ebd8fe18ad5..1f2365822a4551ced188153991e3fa5045bb9a93 100644 (file)
--- a/qcsrc/server/command/cmd.qh
+++ b/qcsrc/server/command/cmd.qh
@@ -10,9 +10,6 @@
 .float cmd_floodcount;
 .float lms_spectate_warning;
 
-// number of monsters spawned with mobspawn command
-float totalspawned;
-
 string MapVote_Suggest(string m);
 
 // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index 5ddea150a974103a04946359bcc5dcf6b22638e1..7dea85ee687cb054e0da5820e68026b3a4ab199d 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -1,10 +1,11 @@
 #include "../../common/command/command.qh"
 #include "common.qh"
-#include "../_all.qh"
 
 #include "../scores.qh"
 
+#include "../../common/monsters/all.qh"
 #include "../../common/notifications.qh"
+#include "../../warpzonelib/common.qh"
 
 
 // ====================================================

diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc
index 1371e80100d24c792f626f91a3a5ce14c1945582..b3eeb1a69bdf2627042ceacb8daf94e107f7d55f 100644 (file)
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -1,6 +1,5 @@
 #include "../../common/command/command.qh"
 #include "getreplies.qh"
-#include "../_all.qh"
 
 #include "../race.qh"
 

diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index 8c15819e05ad174a0ea24f09e573b92061554048..50b09f799ac44636a1cd138506317624e6b0d0c4 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -1,8 +1,8 @@
 #include "../../common/command/command.qh"
 #include "radarmap.qh"
-#include "../_all.qh"
 
 #include "../g_world.qh"
+#include "../g_subs.qh"
 
 #include "../../common/util.qh"
 

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index d08588ff99c1a3501fe28992bee5329c1654b7c5..21255e5ddf50e91d4bc12f44168340fd56ad8e40 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1,6 +1,5 @@
 #include "../../common/command/command.qh"
 #include "sv_cmd.qh"
-#include "../_all.qh"
 
 #include "banning.qh"
 #include "cmd.qh"

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index c92ffd3e82a31dd065d8bd288a97b4cb0f71febe..60faeb3c254c709009966df0ebe13a3b8c725860 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -1,6 +1,5 @@
 #include "../../common/command/command.qh"
 #include "vote.qh"
-#include "../_all.qh"
 
 #include "common.qh"
 

diff --git a/qcsrc/server/controlpoint.qc b/qcsrc/server/controlpoint.qc
index 7f17228fa23b0513b203f77a078bcc9dedd7205a..ceeb4f185b3fd846af054373f3c70ae5e7aa7c93 100644 (file)
--- a/qcsrc/server/controlpoint.qc
+++ b/qcsrc/server/controlpoint.qc
@@ -1,5 +1,9 @@
 #include "controlpoint.qh"
 
+#include "command/common.qh"
+
+.bool iscaptured;
+
 bool cpicon_send(entity this, entity to, int sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_CONTROLPOINT_ICON);

diff --git a/qcsrc/server/ent_cs.qc b/qcsrc/server/ent_cs.qc
index 768eae30b2eb1a16493ae9bc74eaf51d0f8d0e58..548c60429b709b3064eb12491f4585d2a2b388be 100644 (file)
--- a/qcsrc/server/ent_cs.qc
+++ b/qcsrc/server/ent_cs.qc
@@ -1,5 +1,6 @@
 #include "ent_cs.qh"
-#include "_all.qh"
+
+#include "mutators/gamemode_ca.qh"
 
 float entcs_customize()
 {

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 5cae69239ddfb084153e706e5867a8f91d460565..8f9b305049b788aa4a7ed6767fd0f8eb53901bdd 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -1,12 +1,14 @@
 #include "g_damage.qh"
-#include "_all.qh"
 
+#include "bot/bot.qh"
 #include "g_hook.qh"
 #include "mutators/mutators_include.qh"
 #include "scores.qh"
 #include "spawnpoints.qh"
 #include "t_items.qh"
 #include "../common/vehicles/all.qh"
+#include "../common/items/all.qc"
+#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
 #include "weapons/accuracy.qh"
 #include "weapons/csqcprojectile.qh"
 #include "weapons/selection.qh"

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index ec66994280b9874c70af8ddd3cbcfc5e89e76671..d372d3516fef98a1d8742fe0b0e1f3fe2c6cb81d 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -1,7 +1,7 @@
 #include "g_hook.qh"
-#include "_all.qh"
 
 #include "weapons/common.qh"
+#include "weapons/csqcprojectile.qh"
 #include "weapons/weaponsystem.qh"
 #include "weapons/selection.qh"
 #include "weapons/tracing.qh"
@@ -15,6 +15,8 @@
 #include "../warpzonelib/common.qh"
 #include "../warpzonelib/server.qh"
 
+.int state;
+
 /*============================================
 
       Wazat's Xonotic Grappling Hook

diff --git a/qcsrc/server/g_lights.qc b/qcsrc/server/g_lights.qc
index bd5232a1c93338c5de9e164531cd5296798b0730..8399b5fdb976d3c50f1fedf29bb117509c23bc96 100644 (file)
--- a/qcsrc/server/g_lights.qc
+++ b/qcsrc/server/g_lights.qc
@@ -1,9 +1,10 @@
-#include "_all.qh"
 
 void train_next();
 
 const float LOOP = 1;
 
+.float speed;
+
 const float DNOSHADOW = 2;
 const float DFOLLOW = 4;
 .float light_lev;

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index 20020261c0c095b7c4df3bf9c5f4a511fe4958ad..a9353cfe15fde0f099168cb855053283f725986a 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,6 +1,7 @@
-#include "_all.qh"
 
+#include "g_subs.qh"
 #include "../common/triggers/subs.qh"
+#include "../common/triggers/triggers.qh"
 
 entityclass(BGMScript);
 class(BGMScript) .string bgmscript;

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index 585ac42e085b56852be47ac023d9d11976e92404..8544cd926215a94fd9eb1a4446c1ba39f34edf26 100644 (file)
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -1,9 +1,9 @@
 #include "g_subs.qh"
-#include "_all.qh"
 
 #include "antilag.qh"
 #include "command/common.qh"
 #include "../warpzonelib/common.qh"
+#include "../common/triggers/subs.qh"
 
 spawnfunc(info_null)
 {

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index 2a885f901ab2f0b7100326430fa6963ea31c6855..b016acdd623383beda3c47e1b67658dcd3582a29 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -1,5 +1,6 @@
 #include "g_violence.qh"
-#include "_all.qh"
+
+.int state;
 
 bool Violence_GibSplash_SendEntity(entity this, entity to, int sf)
 {

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 75c61d2eef8c9cf6023cc195662c5a3bd137ef0e..cb9aaa3c11f38544759d74059f07ea3b9e77927a 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1,5 +1,4 @@
 #include "g_world.qh"
-#include "_all.qh"
 
 #include "anticheat.qh"
 #include "antilag.qh"
@@ -27,9 +26,11 @@
 #include "../common/monsters/sv_monsters.qh"
 #include "../common/vehicles/all.qh"
 #include "../common/notifications.qh"
+#include "../common/physics.qh"
 #include "../common/playerstats.qh"
 #include "../common/stats.qh"
 #include "../common/teams.qh"
+#include "../common/triggers/trigger/secret.qh"
 #include "../common/util.qh"
 #include "../common/items/all.qh"
 #include "../common/weapons/all.qh"

diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc
index f185d4aef525811dfbb2e88994490dc3c08f307d..a60970d21af00b73d7d9fe72891ec2c60649cdca 100644 (file)
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@ -1,5 +1,4 @@
 #include "ipban.qh"
-#include "_all.qh"
 
 #include "autocvars.qh"
 #include "command/banning.qh"

diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc
index 713fbf6c3df57e87a8c704e7916da1ba11e562b0..fc0dbd4222596d49c78af8b4231c4fccb87a781e 100644 (file)
--- a/qcsrc/server/item_key.qc
+++ b/qcsrc/server/item_key.qc
@@ -1,5 +1,4 @@
 #include "item_key.qh"
-#include "_all.qh"
 
 #include "../common/triggers/subs.qh"
 #include "../common/monsters/all.qh"

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index a8e027df1e1769187e919842d46bac97e1c2005a..5a9f7e0765c85e5a66e6d4ada2da8048b02fd597 100644 (file)
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -1,5 +1,4 @@
 #include "mapvoting.qh"
-#include "_all.qh"
 
 #include "g_world.qh"
 #include "command/cmd.qh"

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 57bbd51d0e1f1c17cf8966c10e3a3c1276b8c2f6..ccefc4c1ee5222d57ed754f6d5cf3e4c45c0aa19 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1,5 +1,4 @@
 #include "miscfunctions.qh"
-#include "_all.qh"
 #include "antilag.qh"
 #include "command/common.qh"
 #include "constants.qh"
@@ -21,6 +20,9 @@
 #include "../common/util.qh"
 #include "../common/turrets/sv_turrets.qh"
 #include "../common/weapons/all.qh"
+#include "../common/vehicles/sv_vehicles.qh"
+#include "../common/vehicles/vehicle.qh"
+#include "../common/items/all.qc"
 #include "../csqcmodellib/sv_model.qh"
 #include "../warpzonelib/anglestransform.qh"
 #include "../warpzonelib/server.qh"

diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh
index d2066b9abde1a14fdee774df9168b86d17347373..2ee316d8c84545ba5678b08ba20b459b00d06b3f 100644 (file)
--- a/qcsrc/server/mutators/gamemode.qh
+++ b/qcsrc/server/mutators/gamemode.qh
@@ -11,6 +11,7 @@
 #include "../round_handler.qh"
 #include "../scores.qh"
 #include "../scores_rules.qh"
+#include "../teamplay.qh"
 
 #include "../bot/bot.qh"
 #include "../bot/navigation.qh"

diff --git a/qcsrc/server/mutators/gamemode_assault.qc b/qcsrc/server/mutators/gamemode_assault.qc
index 1a10e3c6c9c789107fc0b80901f63bc7d941230f..85d975fbc60f7b89f26071138a0b081232b37b3f 100644 (file)
--- a/qcsrc/server/mutators/gamemode_assault.qc
+++ b/qcsrc/server/mutators/gamemode_assault.qc
@@ -1,5 +1,4 @@
 #include "gamemode_assault.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 
@@ -296,6 +295,7 @@ spawnfunc(target_objective_decrease)
 }
 
 // destructible walls that can be used to trigger target_objective_decrease
+spawnfunc(func_breakable);
 spawnfunc(func_assault_destructible)
 {
        if (!g_assault) { remove(self); return; }

diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index 570fc38016ca43cca22568cab450e85e969dc583..e01b6e574970db19a93484c3490db7b4ae3fd38a 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -1,5 +1,4 @@
 #include "gamemode_ca.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 108b8dda6f369b10163cdc376d968e90e6d65a49..78c19243369d6a99b7ed288aab013c2d70ca8321 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -1,10 +1,10 @@
 #include "gamemode_ctf.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 
 #ifdef SVQC
 #include "../../common/vehicles/all.qh"
+#include "../teamplay.qh"
 #endif
 
 #include "../../warpzonelib/common.qh"
@@ -2344,9 +2344,11 @@ spawnfunc(ctf_team)
 // compatibility for quake maps
 spawnfunc(team_CTF_redflag)    { spawnfunc_item_flag_team1(this);    }
 spawnfunc(team_CTF_blueflag)   { spawnfunc_item_flag_team2(this);    }
+spawnfunc(info_player_team1);
 spawnfunc(team_CTF_redplayer)  { spawnfunc_info_player_team1(this);  }
-spawnfunc(team_CTF_blueplayer) { spawnfunc_info_player_team2(this);  }
 spawnfunc(team_CTF_redspawn)   { spawnfunc_info_player_team1(this);  }
+spawnfunc(info_player_team2);
+spawnfunc(team_CTF_blueplayer) { spawnfunc_info_player_team2(this);  }
 spawnfunc(team_CTF_bluespawn)  { spawnfunc_info_player_team2(this);  }
 
 void team_CTF_neutralflag()                     { SELFPARAM(); spawnfunc_item_flag_neutral(self);  }

diff --git a/qcsrc/server/mutators/gamemode_cts.qc b/qcsrc/server/mutators/gamemode_cts.qc
index f9b478232aee988a6cd636fd2f652bdc62794c1a..175950dd8ce438aa5ee41212a9c1e8992c0e9919 100644 (file)
--- a/qcsrc/server/mutators/gamemode_cts.qc
+++ b/qcsrc/server/mutators/gamemode_cts.qc
@@ -1,5 +1,4 @@
 #include "gamemode_cts.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 

diff --git a/qcsrc/server/mutators/gamemode_deathmatch.qc b/qcsrc/server/mutators/gamemode_deathmatch.qc
index 06afc516ba3148e46abfe8591ff98e330418e87a..c3c8b0df5014072d8dfe91b5925e5bff3e742aad 100644 (file)
--- a/qcsrc/server/mutators/gamemode_deathmatch.qc
+++ b/qcsrc/server/mutators/gamemode_deathmatch.qc
@@ -1,3 +1,5 @@
+#include "gamemode.qh"
+
 MUTATOR_HOOKFUNCTION(dm_CountFrags)
 {
        // announce remaining frags

diff --git a/qcsrc/server/mutators/gamemode_domination.qc b/qcsrc/server/mutators/gamemode_domination.qc
index 34b2875105a6f404588ad6d05477c2920230c369..9e309f6e45eb8248a5baafd8b9d14a390de7ed82 100644 (file)
--- a/qcsrc/server/mutators/gamemode_domination.qc
+++ b/qcsrc/server/mutators/gamemode_domination.qc
@@ -1,8 +1,9 @@
 #include "gamemode_domination.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 
+#include "../teamplay.qh"
+
 void dom_EventLog(string mode, float team_before, entity actor) // use an alias for easy changing and quick editing later
 {
        if(autocvar_sv_eventlog)
@@ -295,7 +296,7 @@ void dom_controlpoint_setup()
        WaypointSprite_SpawnFixed(WP_DomNeut, self.origin + '0 0 32', self, sprite, RADARICON_DOMPOINT);
 }
 
-float total_controlpoints, redowned, blueowned, yellowowned, pinkowned;
+float total_controlpoints;
 void Domination_count_controlpoints()
 {
        entity e;

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index e7790c974d435776dee2da7ddd8344bf7e453d6e..85ef5119f85e6d85cde9de45be211f351a6b3f5e 100644 (file)
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -1,5 +1,4 @@
 #include "gamemode_freezetag.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 

diff --git a/qcsrc/server/mutators/gamemode_invasion.qc b/qcsrc/server/mutators/gamemode_invasion.qc
index 5209b225f1084629f085a6cf65b9cc0b86ef7a22..0929d93a5da643993687f1a105cdbe552d87d600 100644 (file)
--- a/qcsrc/server/mutators/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/gamemode_invasion.qc
@@ -1,11 +1,12 @@
 #include "gamemode_invasion.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 
 #include "../../common/monsters/spawn.qh"
 #include "../../common/monsters/sv_monsters.qh"
 
+#include "../teamplay.qh"
+
 spawnfunc(invasion_spawnpoint)
 {
        if(!g_invasion) { remove(self); return; }

diff --git a/qcsrc/server/mutators/gamemode_keepaway.qc b/qcsrc/server/mutators/gamemode_keepaway.qc
index b265e41d3d5ae47a29097f683546e602da99e87a..b4951c6e70d21299a119cf27ef310e9ea53c4eac 100644 (file)
--- a/qcsrc/server/mutators/gamemode_keepaway.qc
+++ b/qcsrc/server/mutators/gamemode_keepaway.qc
@@ -1,5 +1,4 @@
 #include "gamemode_keepaway.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 
@@ -356,6 +355,9 @@ MUTATOR_HOOKFUNCTION(ka_PlayerPowerups)
        return 0;
 }
 
+.float stat_sv_airspeedlimit_nonqw;
+.float stat_sv_maxspeed;
+
 MUTATOR_HOOKFUNCTION(ka_PlayerPhysics)
 {SELFPARAM();
        if(self.ballcarried)

diff --git a/qcsrc/server/mutators/gamemode_keyhunt.qc b/qcsrc/server/mutators/gamemode_keyhunt.qc
index be45c3db0c3785f51f9d5f62744961b7c09ec117..68097755e8e23a5515e95845c9adb7201cbad047 100644 (file)
--- a/qcsrc/server/mutators/gamemode_keyhunt.qc
+++ b/qcsrc/server/mutators/gamemode_keyhunt.qc
@@ -1,5 +1,4 @@
 #include "gamemode_keyhunt.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 

diff --git a/qcsrc/server/mutators/gamemode_lms.qc b/qcsrc/server/mutators/gamemode_lms.qc
index b9395b913a2ad018feeca4540da7dc7adebb513d..b3cf0db6acd4464dddcb923871d47210944c3d54 100644 (file)
--- a/qcsrc/server/mutators/gamemode_lms.qc
+++ b/qcsrc/server/mutators/gamemode_lms.qc
@@ -1,5 +1,4 @@
 #include "gamemode_lms.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index f65e058433ec146ec9799b5d77d672c1bb68c49b..6d5cd7600d21525abf3cb0c50375fd3b34fa59ac 100644 (file)
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -1,5 +1,4 @@
 #include "gamemode_nexball.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 
@@ -772,6 +771,8 @@ void W_Nexball_Attack(float t)
        //TODO: use the speed_up cvar too ??
 }
 
+vector trigger_push_calculatevelocity(vector org, entity tgt, float ht);
+
 void W_Nexball_Attack2(void)
 {SELFPARAM();
        if(self.ballcarried.enemy)
@@ -967,6 +968,9 @@ MUTATOR_HOOKFUNCTION(nexball_PlayerSpawn)
        return false;
 }
 
+.float stat_sv_airspeedlimit_nonqw;
+.float stat_sv_maxspeed;
+
 MUTATOR_HOOKFUNCTION(nexball_PlayerPhysics)
 {SELFPARAM();
        if(self.ballcarried)

diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index ebfc22bb5f9ceb82ebb58c297632ad867eadc7c6..03de8eb6bf333cf3278771b7034932243d2d4296 100644 (file)
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -1,9 +1,10 @@
-#include "../_all.qh"
 
 #include "gamemode.qh"
 #include "../controlpoint.qh"
 #include "../generator.qh"
 
+void FixSize(entity e);
+
 // =======================
 // CaptureShield Functions
 // =======================
@@ -553,6 +554,8 @@ void ons_ControlPoint_Icon_BuildThink()
                Send_Effect(EFFECT_RAGE, self.origin + 10 * randomvec(), '0 0 -1', 1);
 }
 
+void onslaught_controlpoint_icon_link(entity e, void() spawnproc);
+
 void ons_ControlPoint_Icon_Spawn(entity cp, entity player)
 {
        entity e = spawn();

diff --git a/qcsrc/server/mutators/gamemode_race.qc b/qcsrc/server/mutators/gamemode_race.qc
index d51b33ec2f3eb048de0bafd1a809398e664d26e0..271456986d393461bbd21f00030bff8092abda33 100644 (file)
--- a/qcsrc/server/mutators/gamemode_race.qc
+++ b/qcsrc/server/mutators/gamemode_race.qc
@@ -1,5 +1,4 @@
 #include "gamemode_race.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 

diff --git a/qcsrc/server/mutators/gamemode_tdm.qc b/qcsrc/server/mutators/gamemode_tdm.qc
index 451e4a55c32536d35ac84ec33b1b0add8dde0bec..2ff647db0ac0d0b202da97fb9f0dc8dc6ab28f11 100644 (file)
--- a/qcsrc/server/mutators/gamemode_tdm.qc
+++ b/qcsrc/server/mutators/gamemode_tdm.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "gamemode.qh"
 

diff --git a/qcsrc/server/mutators/mutator_bloodloss.qc b/qcsrc/server/mutators/mutator_bloodloss.qc
index da9a608f0156a6bc047aebf8bf98886921673830..06bf72ea0fe63a580e5497286adc336b7f09bb40 100644 (file)
--- a/qcsrc/server/mutators/mutator_bloodloss.qc
+++ b/qcsrc/server/mutators/mutator_bloodloss.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_breakablehook.qc b/qcsrc/server/mutators/mutator_breakablehook.qc
index 149b3d761da4b3e7bf0d7aedcb962529836f0455..b3daba675ad0a55a08575a76fba5f3d1f884936c 100644 (file)
--- a/qcsrc/server/mutators/mutator_breakablehook.qc
+++ b/qcsrc/server/mutators/mutator_breakablehook.qc
@@ -1,3 +1,6 @@
+#include "../../common/deathtypes.qh"
+#include "../g_hook.qh"
+
 REGISTER_MUTATOR(bh, cvar("g_breakablehook"));
 
 bool autocvar_g_breakablehook; // allow toggling mid match?

diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc
index 7aeadce75efde15406d80af051ecdfb9c4ec3e78..739eeb8c91892ce9d027d935e629a4a17ff5f627 100644 (file)
--- a/qcsrc/server/mutators/mutator_buffs.qc
+++ b/qcsrc/server/mutators/mutator_buffs.qc
@@ -1,6 +1,5 @@
 #include "../../common/triggers/target/music.qh"
 #include "mutator_buffs.qh"
-#include "../_all.qh"
 
 #include "mutator.qh"
 
@@ -527,6 +526,10 @@ MUTATOR_HOOKFUNCTION(buffs_PlayerSpawn)
        return false;
 }
 
+.float stat_sv_maxspeed;
+.float stat_sv_airspeedlimit_nonqw;
+.float stat_sv_jumpvelocity;
+
 MUTATOR_HOOKFUNCTION(buffs_PlayerPhysics)
 {SELFPARAM();
        if(self.buffs & BUFF_SPEED.m_itemid)

diff --git a/qcsrc/server/mutators/mutator_campcheck.qc b/qcsrc/server/mutators/mutator_campcheck.qc
index e4ad5ba19854f13851fb987bca87c111f189e1cf..8cfb06440e9083cac9f7df951e3be1809e1e80b5 100644 (file)
--- a/qcsrc/server/mutators/mutator_campcheck.qc
+++ b/qcsrc/server/mutators/mutator_campcheck.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc
index b5dc32fdfe0d924a233b099ab47f802eaceba6e3..e9dd6fd73ca75e0da2cc44c7a5d1fdeee588f338 100644 (file)
--- a/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@ -30,11 +30,11 @@
 
 #ifdef SVQC
 #include "mutator_dodging.qh"
-#include "../_all.qh"
 
 #include "mutator.qh"
 
 #include "../../common/animdecide.qh"
+#include "../../common/physics.qh"
 
 .float cvar_cl_dodging_timeout;
 

diff --git a/qcsrc/server/mutators/mutator_instagib.qc b/qcsrc/server/mutators/mutator_instagib.qc
index 9f88b2b6e8d40638bf96346da31f399929dd94e6..dc1d0eba54dc1c710119ed7e68dd512b17240dff 100644 (file)
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 
@@ -229,6 +228,8 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerPowerups)
        return false;
 }
 
+.float stat_sv_maxspeed;
+
 MUTATOR_HOOKFUNCTION(instagib_PlayerPhysics)
 {SELFPARAM();
        if(self.items & ITEM_Speed.m_itemid)

diff --git a/qcsrc/server/mutators/mutator_instagib_items.qc b/qcsrc/server/mutators/mutator_instagib_items.qc
index 87abd78a2c1d1a060fef72b4efd3bf35dda49683..deecb14678ed7ad6c1743d18eb986ab34f98e66e 100644 (file)
--- a/qcsrc/server/mutators/mutator_instagib_items.qc
+++ b/qcsrc/server/mutators/mutator_instagib_items.qc
@@ -1,4 +1,6 @@
-#include "../../common/items/item.qh"
+#include "../../common/items/all.qh"
+#include "../../common/items/item/ammo.qh"
+#include "../../common/items/item/powerup.qh"
 
 float instagib_respawntime_ammo = 45;
 float instagib_respawntimejitter_ammo = 0;

diff --git a/qcsrc/server/mutators/mutator_invincibleproj.qc b/qcsrc/server/mutators/mutator_invincibleproj.qc
index e7c066afc3030117e399628344e43f45acc74c96..2855a074f765a07d16f842d357b39332046c3278 100644 (file)
--- a/qcsrc/server/mutators/mutator_invincibleproj.qc
+++ b/qcsrc/server/mutators/mutator_invincibleproj.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_melee_only.qc b/qcsrc/server/mutators/mutator_melee_only.qc
index fb8aac419f881c97b3e453122c36ad7ebb77de76..019eeb8017af87f196e5c100a9fdb0f0f50e44c2 100644 (file)
--- a/qcsrc/server/mutators/mutator_melee_only.qc
+++ b/qcsrc/server/mutators/mutator_melee_only.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_midair.qc b/qcsrc/server/mutators/mutator_midair.qc
index 3ac73031713d92d47be9d605f5472cf1bbd3ea3b..33ae58f4dd0fefb485d01b03f6bd9208c93af2c8 100644 (file)
--- a/qcsrc/server/mutators/mutator_midair.qc
+++ b/qcsrc/server/mutators/mutator_midair.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_multijump.qc b/qcsrc/server/mutators/mutator_multijump.qc
index 04e60bb83ec490cc6ebad1483a0642dfefff4fef..de6296d820dbb9996891ee4541b8f29ab3b57feb 100644 (file)
--- a/qcsrc/server/mutators/mutator_multijump.qc
+++ b/qcsrc/server/mutators/mutator_multijump.qc
@@ -1,8 +1,8 @@
 #ifdef SVQC
-       #include "../_all.qh"
        #include "mutator.qh"
        #include "../antilag.qh"
 #endif
+#include "../../common/physics.qh"
 
 .int multijump_count;
 .bool multijump_ready;

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index 4fdbbd353dbf4ef70e4d9dbed1cfd3f608585215..1a07f5e7c1bc5ff8f09a3040f9c3d5390b69459f 100644 (file)
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -1,5 +1,4 @@
 #include "mutator_nades.qh"
-#include "../_all.qh"
 
 #include "mutator.qh"
 
@@ -8,6 +7,7 @@
 #include "../../common/nades/all.qh"
 #include "../../common/monsters/spawn.qh"
 #include "../../common/monsters/sv_monsters.qh"
+#include "../g_subs.qh"
 
 .float nade_time_primed;
 

diff --git a/qcsrc/server/mutators/mutator_new_toys.qc b/qcsrc/server/mutators/mutator_new_toys.qc
index 9b51d9abb8640fbcaf4f3bbcf5ef83d5f652f760..93b64ebcc69258094d5b29dfe02b848f33362b4a 100644 (file)
--- a/qcsrc/server/mutators/mutator_new_toys.qc
+++ b/qcsrc/server/mutators/mutator_new_toys.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index 5339d319ec558c63aab46f745fe68dcb7bdd0031..2a26d9326be9a15742479ad9337ce3b04cd409f5 100644 (file)
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index d2086215f931dc94143c9c1e71958e8932d14a0b..96376e24b13a1c67053d2c88af56108706624a57 100644 (file)
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -1,5 +1,4 @@
 #include "mutator_overkill.qh"
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_physical_items.qc b/qcsrc/server/mutators/mutator_physical_items.qc
index 144a8d2eaa099871a0ff8b62431463cd68045896..d1272319ee2959d690dfd1dd0472904bf629b80c 100644 (file)
--- a/qcsrc/server/mutators/mutator_physical_items.qc
+++ b/qcsrc/server/mutators/mutator_physical_items.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_pinata.qc b/qcsrc/server/mutators/mutator_pinata.qc
index 71262b923df8ca18e4ff4a6b36ab7d18cb46f30f..4c450a85cd392136f4305ec838dabfb0d860a7e5 100644 (file)
--- a/qcsrc/server/mutators/mutator_pinata.qc
+++ b/qcsrc/server/mutators/mutator_pinata.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_random_gravity.qc b/qcsrc/server/mutators/mutator_random_gravity.qc
index 060ed74f831dfe53cbe47ab6fe500b2450b9d28f..ff85f29059d01c892d1f7ae7c2fe3a0211ffd02e 100644 (file)
--- a/qcsrc/server/mutators/mutator_random_gravity.qc
+++ b/qcsrc/server/mutators/mutator_random_gravity.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_rocketflying.qc b/qcsrc/server/mutators/mutator_rocketflying.qc
index 5f684b353191f84bc45a150fb34b3609974b24e1..c403e9f9ca47d1335d39de0ee05f67cc9204357d 100644 (file)
--- a/qcsrc/server/mutators/mutator_rocketflying.qc
+++ b/qcsrc/server/mutators/mutator_rocketflying.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_rocketminsta.qc b/qcsrc/server/mutators/mutator_rocketminsta.qc
index 07148cc58d02fa455c39c97210e248108ad9ce31..4a4daa3c380ac523a7a1dbab07fc8816c037ffb3 100644 (file)
--- a/qcsrc/server/mutators/mutator_rocketminsta.qc
+++ b/qcsrc/server/mutators/mutator_rocketminsta.qc
@@ -1,3 +1,6 @@
+#include "../../common/deathtypes.qh"
+#include "../round_handler.qh"
+
 REGISTER_MUTATOR(rm, cvar("g_instagib"));
 
 MUTATOR_HOOKFUNCTION(rm, PlayerDamage_Calculate)

diff --git a/qcsrc/server/mutators/mutator_spawn_near_teammate.qc b/qcsrc/server/mutators/mutator_spawn_near_teammate.qc
index e3178b338874f9892eb174afdffa6800e2c3c8a7..c996f1a12c0146112a1f51eb04aa094da34def6b 100644 (file)
--- a/qcsrc/server/mutators/mutator_spawn_near_teammate.qc
+++ b/qcsrc/server/mutators/mutator_spawn_near_teammate.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_superspec.qc b/qcsrc/server/mutators/mutator_superspec.qc
index 32e81319dfe87dda5d6eeaa680aed00836bd77ae..e0b5ad35dc63387a86d2c57ff993808d8be90910 100644 (file)
--- a/qcsrc/server/mutators/mutator_superspec.qc
+++ b/qcsrc/server/mutators/mutator_superspec.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_touchexplode.qc b/qcsrc/server/mutators/mutator_touchexplode.qc
index faa74bb1dcf74e989eeb50311e1b83c82bd1fba6..e78b0d78fc09ab1153eb74b5c65c78e98b594a0d 100644 (file)
--- a/qcsrc/server/mutators/mutator_touchexplode.qc
+++ b/qcsrc/server/mutators/mutator_touchexplode.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/mutator_vampire.qc b/qcsrc/server/mutators/mutator_vampire.qc
index 6b2859f440b17ec46b042e8d850c51f0fb231eb1..b5cad57aefbd37e854ebf37fdbeb5fe79b96a83e 100644 (file)
--- a/qcsrc/server/mutators/mutator_vampire.qc
+++ b/qcsrc/server/mutators/mutator_vampire.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index ed3ffc5e77dfe6c3cd90afdcdad0e8bf2475a3d4..7a52f0c6961d9531b7f25cbc0ffbddd9e21b3f62 100644 (file)
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "mutator.qh"
 

diff --git a/qcsrc/server/pathlib/_all.inc b/qcsrc/server/pathlib/_all.inc
index 8622734d075ff4b724257b1b8d1528a8efbaf583..1b15654e4a8dceba366ab6730a7a8b4c6ba90f2f 100644 (file)
--- a/qcsrc/server/pathlib/_all.inc
+++ b/qcsrc/server/pathlib/_all.inc
@@ -1,6 +1,11 @@
+#define DEBUGPATHING
+
 #include "costs.qc"
 #include "expandnode.qc"
 #include "main.qc"
 #include "movenode.qc"
 #include "path_waypoint.qc"
 #include "utility.qc"
+#ifdef DEBUGPATHING
+       #include "debug.qc"
+#endif

diff --git a/qcsrc/server/pathlib/debug.qc b/qcsrc/server/pathlib/debug.qc
index 37e167aae71064e0b87c927aaf8f730058b92e0b..434f50b8641bcb3aeeb3f8a76efc1e0ee17c4b13 100644 (file)
--- a/qcsrc/server/pathlib/debug.qc
+++ b/qcsrc/server/pathlib/debug.qc
@@ -51,7 +51,6 @@ void pathlib_showpath2(entity path)
     path.nextthink = time;
 }
 
-
 void pathlib_showsquare2(entity node ,vector ncolor,float align)
 {
 

diff --git a/qcsrc/server/pathlib/main.qc b/qcsrc/server/pathlib/main.qc
index f097e8a0fec8199dabff0c0501307ab768bfe703..800f0335ef85ea3305b6ec1f60ccfb824ac67540 100644 (file)
--- a/qcsrc/server/pathlib/main.qc
+++ b/qcsrc/server/pathlib/main.qc
@@ -1,4 +1,3 @@
-#include "../_all.qh"
 
 #include "pathlib.qh"
 #include "utility.qh"
@@ -27,6 +26,14 @@ void dumpnode(entity n)
     n.nextthink    = time;
 }
 
+#ifdef DEBUGPATHING
+void pathlib_showpath(entity start);
+void pathlib_showpath2(entity path);
+#endif
+
+void pathlib_showsquare(vector where,float goodsquare,float _lifetime);
+void pathlib_showsquare2(entity node ,vector ncolor,float align);
+
 entity pathlib_mknode(vector where,entity parent)
 {
     entity node;

diff --git a/qcsrc/server/pathlib/movenode.qc b/qcsrc/server/pathlib/movenode.qc
index 6645d712661d9a08e5c95be125f41073d526f783..e3bcac61e4f289d2b54d8cd581e737baff7898d6 100644 (file)
--- a/qcsrc/server/pathlib/movenode.qc
+++ b/qcsrc/server/pathlib/movenode.qc
@@ -1,8 +1,9 @@
-#include "../_all.qh"
 
 #include "pathlib.qh"
 #include "utility.qh"
 
+.vector        pos1, pos2;
+
 vector pathlib_wateroutnode(vector start,vector end, float doedge)
 {SELFPARAM();
     vector surface;

diff --git a/qcsrc/server/pathlib/pathlib.qh b/qcsrc/server/pathlib/pathlib.qh
index dbf785266ae67a266a1b9d9c4f66ebac245fc60c..d88a43ed8e14fc2f6ad8bfad91214a7805e5e132 100644 (file)
--- a/qcsrc/server/pathlib/pathlib.qh
+++ b/qcsrc/server/pathlib/pathlib.qh
@@ -13,7 +13,6 @@ const vector PLIB_FORWARD = '0 1 0';
 const vector PLIB_RIGHT = '1 0 0';
 //#define PLIB_LEFT    '-1 0 0'
 
-#define DEBUGPATHING
 #ifdef DEBUGPATHING
 void pathlib_showpath(entity start);
 void pathlib_showpath2(entity path);
@@ -109,8 +108,4 @@ var float  buildpath_nodefilter(vector n,vector c,vector p);
 
 var float  pathlib_wpp_waypointcallback(entity wp, entity wp_prev);
 
-#ifdef DEBUGPATHING
-       #include "debug.qc"
-#endif
-
 #endif

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 30fa073849d9f9b5827a050a5b269ce1b7269b03..09776c4d68c45d1043dd6aff5a4781252804d89a 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -1,5 +1,4 @@
 #include "portals.qh"
-#include "_all.qh"
 
 #include "g_hook.qh"
 #include "mutators/mutators_include.qh"
@@ -13,6 +12,9 @@
 #include "../csqcmodellib/sv_model.qh"
 #include "../warpzonelib/anglestransform.qh"
 #include "../warpzonelib/util_server.qh"
+#include "../warpzonelib/common.qh"
+#include "../common/vehicles/vehicle.qh"
+#include "../common/vehicles/sv_vehicles.qh"
 
 #define PORTALS_ARE_NOT_SOLID
 

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index fbf1eaa185af29a2b6a5d3ab61b72410e6763e6c..3ac5582d61acbaf362ee4e6cc96c0ecd826c2c42 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -1,5 +1,4 @@
 #include "race.qh"
-#include "_all.qh"
 
 #include "cl_client.qh"
 #include "portals.qh"
@@ -11,7 +10,10 @@
 #include "../common/deathtypes.qh"
 #include "../common/notifications.qh"
 #include "../common/mapinfo.qh"
+#include "../common/triggers/subs.qh"
 #include "../warpzonelib/util_server.qh"
+#include "../warpzonelib/common.qh"
+#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
 
 void W_Porto_Fail(float failhard);
 

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 0d608f9af76268de54d415746ca813e2b965453c..e6a1334f88426fec87ff6b2a95ae312391dcfd24 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,5 +1,4 @@
 #include "round_handler.qh"
-#include "_all.qh"
 
 #include "command/vote.qh"
 #include "../common/util.qh"

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 14893b12d8a9d3140da373415fc4b35871fdf56d..bb489f76fc72a2c74073a0ae387f3bd001fd1d37 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -1,5 +1,4 @@
 #include "scores.qh"
-#include "_all.qh"
 
 #include "command/common.qh"
 #include "mutators/mutators_include.qh"

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index aefb1754b5ceaab137e2e4d1bb13fa4fa2a3374f..07d7267910cc7391e3e79deccdd4a1416289b4ec 100644 (file)
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -1,5 +1,4 @@
 #include "scores_rules.qh"
-#include "_all.qh"
 
 #include "cl_client.qh"
 #include "scores.qh"

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 09d914a3c86751b7f0d6bbc97e49c8277575e560..ead90d30b56079f0c1fa1e4bad0caa169415e92d 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,12 +1,13 @@
 #include "spawnpoints.qh"
-#include "_all.qh"
 
 #include "mutators/mutators_include.qh"
 #include "g_world.qh"
 #include "race.qh"
 #include "../common/constants.qh"
 #include "../common/teams.qh"
+#include "../common/triggers/subs.qh"
 #include "../common/util.qh"
+#include "../warpzonelib/common.qh"
 #include "../warpzonelib/util_server.qh"
 
 bool SpawnPoint_Send(entity this, entity to, int sf)

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 138051827bcad56fac48d9ed1f993596a8f405cc..05fee86da8468024ed111fed26079c97276a39fb 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -1,4 +1,3 @@
-#include "_all.qh"
 
 #include "anticheat.qh"
 #include "g_hook.qh"
@@ -26,6 +25,7 @@
 #include "../warpzonelib/server.qh"
 
 .float lastground;
+.int state;
 
 void CreatureFrame (void)
 {SELFPARAM();

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 0a5785037f0223df12170535d348786cdb431d4b..eee53e616d783f0eb02bc9b09f80831748bf00a9 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -3,7 +3,6 @@
 #include "../common/items/all.qc"
 
 #if defined(SVQC)
-    #include "_all.qh"
 
     #include "bot/bot.qh"
     #include "bot/waypoints.qh"

diff --git a/qcsrc/server/t_items.qh b/qcsrc/server/t_items.qh
index 81554c4c2ff4f7f326806c3e2afad91411de6efa..8195d250d023b4e528cb40bfd67d272fde8392c0 100644 (file)
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -24,6 +24,10 @@ const int ISF_SIZE                           = 128;
 .float fade_start;
 .float fade_end;
 
+#ifdef SVQC
+void StartItemA (entity a);
+#endif
+
 #ifdef CSQC
 
 float  autocvar_cl_animate_items = 1;

diff --git a/qcsrc/server/t_quake.qc b/qcsrc/server/t_quake.qc
index 9e22b8d06542ddf2236c4cb2a5ba57dbbbe9e546..29de5d4c71a530623e0e938e291bf0976c618574 100644 (file)
--- a/qcsrc/server/t_quake.qc
+++ b/qcsrc/server/t_quake.qc
@@ -1,4 +1,3 @@
-#include "_all.qh"
 
 #include "../common/weapons/all.qh"
 

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index c8f595761d0b6e03ad911b66cb6f1c7080f1b82a..94663fc36534a93502fc0f6816a2d13da945417d 100644 (file)
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -1,4 +1,3 @@
-#include "_all.qh"
 
 #include "../common/weapons/all.qh"
 #include "../common/buffs/all.qh"
@@ -65,6 +64,9 @@ spawnfunc(item_armor_combat)   { spawnfunc_item_armor_big(this);      }
 spawnfunc(item_armor_shard)    { spawnfunc_item_armor_small(this);    }
 spawnfunc(item_enviro)         { spawnfunc_item_invincible(this);     }
 
+.float wait;
+.float delay;
+
 // weapon remove ent from df
 void target_init_verify()
 {

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 2fbbd50b32e3c9dc78b214ae0dcda2c6a9f817e3..46b82ac6526744dccc95bd014326dd98caf5f3fb 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -1,5 +1,4 @@
 #include "teamplay.qh"
-#include "_all.qh"
 
 #include "cl_client.qh"
 #include "race.qh"

diff --git a/qcsrc/server/teamplay.qh b/qcsrc/server/teamplay.qh
index 3ce05ac2a66c2d24ab50dc74b91a94c61d6d156a..5664d261daa1a6b26376899369562fe9abc51132 100644 (file)
--- a/qcsrc/server/teamplay.qh
+++ b/qcsrc/server/teamplay.qh
@@ -9,6 +9,8 @@ string cache_lastmutatormsg;
 // # of bots on those teams
 float cb1, cb2, cb3, cb4;
 
+int redowned, blueowned, yellowowned, pinkowned;
+
 //float audit_teams_time;
 
 void TeamchangeFrags(entity e);

diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc
index 09f155ecbd7ea68052a953e1f713c560f0d829b4..baa95c64952ffd34b0fcc56d5da4e0bb6062cb21 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qc
+++ b/qcsrc/server/weapons/accuracy.qc
@@ -1,5 +1,4 @@
 #include "accuracy.qh"
-#include "../_all.qh"
 
 #include "../mutators/mutators_include.qh"
 #include "../../common/constants.qh"

diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index f1720757f6607564db7f1a89083570178afac39b..d4e29cb04233182cc63bc83fadd602edbeb160ec 100644 (file)
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -1,5 +1,4 @@
 #include "common.qh"
-#include "../_all.qh"
 
 #include "../t_items.qh"
 #include "../../common/constants.qh"
@@ -7,6 +6,7 @@
 #include "../../common/notifications.qh"
 #include "../../common/util.qh"
 #include "../../common/weapons/all.qh"
+#include "../../common/items/all.qc"
 
 void W_GiveWeapon (entity e, float wep)
 {SELFPARAM();

diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc
index ca98ad10b8bc3837d29651542795ec1ba20e4a7f..1e254b804e13e2b2c28bc73db985d237ba733a79 100644 (file)
--- a/qcsrc/server/weapons/csqcprojectile.qc
+++ b/qcsrc/server/weapons/csqcprojectile.qc
@@ -1,5 +1,4 @@
 #include "csqcprojectile.qh"
-#include "../_all.qh"
 
 #include "../t_items.qh"
 

diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc
index 39d91a21e9f78ff3de1ff4a74dea83a6ff7a6ecb..ec48c6d3cea09c19bb6498cc9f1c47691c7aad4c 100644 (file)
--- a/qcsrc/server/weapons/hitplot.qc
+++ b/qcsrc/server/weapons/hitplot.qc
@@ -1,7 +1,7 @@
 #include "hitplot.qh"
-#include "../_all.qh"
 
 #include "../antilag.qh"
+#include "../g_subs.qh"
 #include "../../common/weapons/all.qh"
 
 vector W_HitPlotUnnormalizedUntransform(vector screenforward, vector screenright, vector screenup, vector v)

diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc
index ce2a671c4584f9290ea9a67d93b985c102f11179..b7eb2fe097e0e169d3cf6a1f9177c0292701dc6c 100644 (file)
--- a/qcsrc/server/weapons/selection.qc
+++ b/qcsrc/server/weapons/selection.qc
@@ -1,11 +1,12 @@
 #include "selection.qh"
-#include "../_all.qh"
 
 #include "weaponsystem.qh"
 #include "../t_items.qh"
 #include "../../common/constants.qh"
 #include "../../common/util.qh"
+#include "../../common/items/item.qh"
 #include "../../common/weapons/all.qh"
+#include "../../common/mutators/mutator/waypoints/waypointsprites.qh"
 
 // switch between weapons
 void Send_WeaponComplain(entity e, float wpn, float type)

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index b011bb1fffd3e9c1fd5d3318d0765edd1bc26da7..be2ca6b50f0c6d734d1903aa9470c6d19f1bb291 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,5 +1,4 @@
 #include "spawning.qh"
-#include "../_all.qh"
 
 #include "weaponsystem.qh"
 #include "../mutators/mutators_include.qh"

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index a649cf75b9858ee2d84ce74ce6e1b857e021a522..83025da9a859869669381fc26167a9fadef66f8b 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -1,12 +1,13 @@
 #include "throwing.qh"
-#include "../_all.qh"
 
 #include "weaponsystem.qh"
 #include "../mutators/mutators_include.qh"
 #include "../t_items.qh"
 #include "../g_damage.qh"
+#include "../../common/items/item.qh"
 #include "../../common/mapinfo.qh"
 #include "../../common/notifications.qh"
+#include "../../common/triggers/subs.qh"
 #include "../../common/util.qh"
 #include "../../common/weapons/all.qh"
 

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 69821aaaf6d84f42f79055407747e6f521e14d8c..b88acaa5165e31e1423eca259295a5794bf4f71f 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -1,9 +1,9 @@
 #include "tracing.qh"
-#include "../_all.qh"
 
 #include "accuracy.qh"
 #include "common.qh"
 #include "hitplot.qh"
+#include "weaponsystem.qh"
 
 #include "../g_damage.qh"
 #include "../g_subs.qh"

diff --git a/qcsrc/server/weapons/weaponstats.qc b/qcsrc/server/weapons/weaponstats.qc
index 6701f5829a25839ba5e353d7deaaaee12cae8aa2..ce1fb6100cfe6c8d16d5117b860ad30f515a8340 100644 (file)
--- a/qcsrc/server/weapons/weaponstats.qc
+++ b/qcsrc/server/weapons/weaponstats.qc
@@ -1,5 +1,4 @@
 #include "weaponstats.qh"
-#include "../_all.qh"
 
 #include "../g_world.qh"
 

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index ae76b36b662901661a8cdb172126bfd4c21f015d..3f74034f18bfc9ca5d776a301fad679dc6e1d553 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -1,5 +1,4 @@
 #include "weaponsystem.qh"
-#include "../_all.qh"
 
 #include "selection.qh"
 
@@ -24,6 +23,8 @@
 ===========================================================================
 */
 
+.int state;
+
 .float weapon_frametime;
 
 float W_WeaponRateFactor()