Purge server/defs.qh

diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index 69fe458269845c7e0acf7b3eaa17c3008cd5581d..136e4d436669695d88000651798fac34834a8cf8 100644 (file)
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -4,7 +4,8 @@
 
 #if defined(SVQC)
     #include "util.qh"
-    #include "../server/defs.qh"
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
 #endif
 
 bool monsters_animoverride(entity this)

diff --git a/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc b/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
index 09d93edf013f60ae2c739ded7740b10ddb9b8cf0..3915429d63f1eaab0f47357384641febd91943e1 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
+++ b/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
@@ -3,6 +3,7 @@
 #include <server/command/vote.qh>
 #include <common/mapobjects/func/breakable.qh>
 #include <common/mapobjects/triggers.qh>
+#include <common/turrets/sv_turrets.qh>
 #include <server/g_damage.qh>
 #include <server/g_world.qh>
 #include <server/spawnpoints.qh>

diff --git a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
index 34c7b26c2a70795d4a3d631c7a133fc8c4714e67..22d021cf546d5be390c43c60e598bbfb5c2edaf5 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
+++ b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
@@ -5,6 +5,7 @@
 #include <server/g_world.qh>
 #include <server/gamelog.qh>
 #include <server/items/spawning.qh>
+#include <server/weapons/common.qh>
 #include <common/mapobjects/triggers.qh>
 
 float autocvar_g_cts_finish_kill_delay;

diff --git a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
index 2825bbcce0d395c44c676d22947490f9723b4b19..410d07e8f1164fc1fc3933241eb7554cf7d338ad 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
+++ b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
@@ -4,6 +4,7 @@
 #include <server/command/vote.qh>
 #include <server/g_damage.qh>
 #include <server/gamelog.qh>
+#include <server/items/items.qh>
 #include <server/teamplay.qh>
 #include <common/mapobjects/platforms.qh>
 #include <common/mapobjects/triggers.qh>

diff --git a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
index 9bccb31a179c443b6057168435460bb20233dfd2..09be394fb14ebed6751320f46ea3f067add7fc82 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
+++ b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
@@ -5,6 +5,7 @@
 #include <common/monsters/sv_spawner.qh>
 #include <common/monsters/sv_monsters.qh>
 
+#include <server/bot/api.qh>
 #include <server/g_world.qh>
 #include <server/teamplay.qh>
 

diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
index 63f1d24d643a33219b46882e2a3a850ebab45829..6ce13f2e99563e73ceb973a99e180e032d456f25 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
@@ -4,6 +4,7 @@
 #include <server/client.qh>
 #include <server/gamelog.qh>
 #include <server/g_damage.qh>
+#include <server/items/items.qh>
 
 .entity ballcarried;
 

diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
index dd702cb5f92eb2f33679f4b772ddf27f23c74bf5..5e098c67cc3012d41f9dc6f7cb4f155f2a307dc0 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
@@ -3,6 +3,7 @@
 #include <server/command/vote.qh>
 #include <server/gamelog.qh>
 #include <server/g_damage.qh>
+#include <server/items/items.qh>
 #include <common/mapobjects/triggers.qh>
 
 float autocvar_g_balance_keyhunt_damageforcescale;

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
index ece18a32eed62893c56b9f4d14d4f590b94ad684..6bb2387dd3362d653620a6288790d979786fca14 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
@@ -2,6 +2,7 @@
 #include "sv_controlpoint.qh"
 #include "sv_generator.qh"
 
+#include <server/bot/api.qh>
 #include <server/command/vote.qh>
 #include <server/g_damage.qh>
 #include <server/items/items.qh>

diff --git a/qcsrc/common/mapobjects/func/ladder.qh b/qcsrc/common/mapobjects/func/ladder.qh
index e087ba8410a341fb09d77f6fa338030a7d109b65..73542ae45cebb95cc9523ffe1c87ba6f1cc9b81f 100644 (file)
--- a/qcsrc/common/mapobjects/func/ladder.qh
+++ b/qcsrc/common/mapobjects/func/ladder.qh
@@ -3,4 +3,9 @@
 IntrusiveList g_ladderents;
 STATIC_INIT(g_ladderents) { g_ladderents = IL_NEW(); }
 
+#ifdef SVQC
+IntrusiveList g_ladders;
+STATIC_INIT(g_ladders) { g_ladders = IL_NEW(); }
+#endif
+
 .entity ladder_entity;

diff --git a/qcsrc/common/mapobjects/misc/dynlight.qc b/qcsrc/common/mapobjects/misc/dynlight.qc
index 6e9f02b874a2c51610282c881121da037dbfc2c5..96d99b592dab099dc4de76a696ed1a71738d155d 100644 (file)
--- a/qcsrc/common/mapobjects/misc/dynlight.qc
+++ b/qcsrc/common/mapobjects/misc/dynlight.qc
@@ -1,7 +1,8 @@
 #include "dynlight.qh"
 
 #ifdef SVQC
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 
 const float LOOP = 1;

diff --git a/qcsrc/common/mapobjects/models.qc b/qcsrc/common/mapobjects/models.qc
index c70effedb2eb3e93b2472fe6d5cd118e4bdf966e..6b272d1b1671f2afc7515d2b48a6ca978a1237aa 100644 (file)
--- a/qcsrc/common/mapobjects/models.qc
+++ b/qcsrc/common/mapobjects/models.qc
@@ -1,7 +1,8 @@
 #include "models.qh"
 
 #ifdef SVQC
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include <common/net_linked.qh>
 #include "subs.qh"

diff --git a/qcsrc/common/mapobjects/target/location.qh b/qcsrc/common/mapobjects/target/location.qh
index 6f70f09beec2219624baeca92e2cd7deaa104fb4..4388ad6db2046497c6ebbad86949c6696b51c725 100644 (file)
--- a/qcsrc/common/mapobjects/target/location.qh
+++ b/qcsrc/common/mapobjects/target/location.qh
@@ -1 +1,6 @@
 #pragma once
+
+#ifdef SVQC
+IntrusiveList g_locations;
+STATIC_INIT(g_locations) { g_locations = IL_NEW(); }
+#endif

diff --git a/qcsrc/common/mapobjects/target/music.qc b/qcsrc/common/mapobjects/target/music.qc
index 55ccf41fbf2db9da6b46b1e3008a027795d16878..37ec30d645e535c3da8631af194475384ec2cc42 100644 (file)
--- a/qcsrc/common/mapobjects/target/music.qc
+++ b/qcsrc/common/mapobjects/target/music.qc
@@ -5,7 +5,8 @@
     #include <common/constants.qh>
     #include <common/net_linked.qh>
     #include <server/constants.qh>
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
 #endif
 
 REGISTER_NET_TEMP(TE_CSQC_TARGET_MUSIC)

diff --git a/qcsrc/common/mapobjects/target/spawn.qc b/qcsrc/common/mapobjects/target/spawn.qc
index 8eaab68ba8c3be9ef3a03b12a971482c08fe21d2..0c607934cbc95a07bae22cbe7109350d9175955e 100644 (file)
--- a/qcsrc/common/mapobjects/target/spawn.qc
+++ b/qcsrc/common/mapobjects/target/spawn.qc
@@ -3,7 +3,8 @@
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include <common/util.qh>
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
     #include <server/g_world.qh>
 #endif
 

diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc
index 11cdf3bdd4d87c5b236ad1a03e055f383fab56e1..24b7fb99cb4222c144419d515a74d7fb1376432d 100644 (file)
--- a/qcsrc/common/mapobjects/teleporters.qc
+++ b/qcsrc/common/mapobjects/teleporters.qc
@@ -12,7 +12,8 @@
     #include <server/weapons/csqcprojectile.qh>
     #include <server/autocvars.qh>
     #include <server/constants.qh>
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
     #include "../deathtypes/all.qh"
     #include <server/sv_main.qh>
     #include "../turrets/sv_turrets.qh"

diff --git a/qcsrc/common/mapobjects/trigger/secret.qc b/qcsrc/common/mapobjects/trigger/secret.qc
index e1b1e5531f7a01c8890329924cc949abbbccdbb6..d1277c87ba689dacfad7436fddb55df54b36e428 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/secret.qc
+++ b/qcsrc/common/mapobjects/trigger/secret.qc
@@ -3,7 +3,8 @@
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include <common/util.qh>
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
 #endif
 
 #ifdef SVQC

diff --git a/qcsrc/common/mapobjects/trigger/swamp.qc b/qcsrc/common/mapobjects/trigger/swamp.qc
index 495deb7988693b565c3d5e9eec12816ec5d22853..3aa6134a9a3cef9cd8cf6cd57a0932c262e2729e 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/swamp.qc
+++ b/qcsrc/common/mapobjects/trigger/swamp.qc
@@ -4,7 +4,8 @@
 #elif defined(SVQC)
     #include <lib/warpzone/util_server.qh>
     #include <common/weapons/_all.qh>
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
     #include <common/deathtypes/all.qh>
 #endif
 

diff --git a/qcsrc/common/mapobjects/trigger/viewloc.qc b/qcsrc/common/mapobjects/trigger/viewloc.qc
index b9b63b823b42bf19087cb45b61b82dc20708ab75..c8c0836117a519fb13f4066f688931a236cb8db6 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/viewloc.qc
+++ b/qcsrc/common/mapobjects/trigger/viewloc.qc
@@ -4,7 +4,8 @@
 #elif defined(SVQC)
     #include <lib/warpzone/util_server.qh>
        #include <common/mapobjects/triggers.qh>
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
 #endif
 
 REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC)

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 768e94b83567c3252d5dc253fe600c311a4b5583..46bb1593a050b1d937936e78c9412fd31fb10a53 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -8,7 +8,8 @@
 #include "../physics/movelib.qh"
 #include "../weapons/_mod.qh"
 #include <server/autocvars.qh>
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/g_damage.qh>
 #include "../deathtypes/all.qh"
 #include <server/items/items.qh>

diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh
index 755abaaf2c67f69950d4be432bd6f8c3c7cddad6..b6cab12b652872bc6f9a6af63079acad1c540315 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qh
+++ b/qcsrc/common/monsters/sv_monsters.qh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "all.qh"
+
 // stats networking
 int monsters_total;
 int monsters_killed;
@@ -110,3 +112,9 @@ ALLMONSTERSOUNDS
 #undef _MSOUND
 
 float GetMonsterSoundSampleField_notFound;
+
+IntrusiveList g_monsters;
+STATIC_INIT(g_monsters) { g_monsters = IL_NEW(); }
+
+IntrusiveList g_monster_targets;
+STATIC_INIT(g_monster_targets) { g_monster_targets = IL_NEW(); }

diff --git a/qcsrc/common/monsters/sv_spawn.qc b/qcsrc/common/monsters/sv_spawn.qc
index 5b4e9a206120ae7af7f847e23e14ed5cd2da7636..4cdfb24e40038097dca08a5c4f7fe21a4cb160a0 100644 (file)
--- a/qcsrc/common/monsters/sv_spawn.qc
+++ b/qcsrc/common/monsters/sv_spawn.qc
@@ -6,7 +6,8 @@
     #include "all.qh"
     #include "sv_monsters.qh"
     #include <server/autocvars.qh>
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
     #include <server/weapons/common.qh>
 #endif
 entity spawnmonster (entity e, string monster, Monster monster_id, entity spawnedby, entity own, vector orig, bool respwn, bool removeifinvalid, int moveflag)

diff --git a/qcsrc/common/monsters/sv_spawner.qc b/qcsrc/common/monsters/sv_spawner.qc
index d12ee2bc6c184196a462a4d85ae218f80a9970b8..98222f6ac9b37e68531db26c8eca575ab0d1a118 100644 (file)
--- a/qcsrc/common/monsters/sv_spawner.qc
+++ b/qcsrc/common/monsters/sv_spawner.qc
@@ -1,3 +1,4 @@
+#include "sv_monsters.qh"
 #include "sv_spawner.qh"
 #include "sv_spawn.qh"
 

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index 0eda6066119b4c7bfd688e13afc53d78406b3810..29828a094c9473b354532b27a41bd17d9e370759 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@ -2,6 +2,7 @@
 
 #include <common/mapobjects/target/music.qh>
 #include <common/gamemodes/_mod.qh>
+#include <server/items/items.qh>
 #include <server/sv_main.qh>
 
 void buffs_DelayedInit(entity this);

diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc
index 129c42d47384b6e0fe424ccb64d3118ab3a73791..d91e16f4700a1f7b887b7115b2beda58476b310a 100644 (file)
--- a/qcsrc/common/playerstats.qc
+++ b/qcsrc/common/playerstats.qc
@@ -7,7 +7,7 @@
     #include <common/weapons/_all.qh>
     #include <server/client.qh>
     #include "../server/anticheat.qh"
-    #include "../server/defs.qh"
+    #include <common/stats.qh>
     #include "../server/scores.qh"
        #include <server/g_world.qh>
     #include "../server/weapons/accuracy.qh"

diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc
index 20af4197c7a8a32129984e60f217345b6280b117..84b0c824908da1c96a49b618495b34fcbcb748f2 100644 (file)
--- a/qcsrc/common/turrets/sv_turrets.qc
+++ b/qcsrc/common/turrets/sv_turrets.qc
@@ -1,6 +1,7 @@
 #include "sv_turrets.qh"
 #ifdef SVQC
 #include <server/autocvars.qh>
+#include <server/bot/api.qh>
 #include <server/g_damage.qh>
 #include <server/weapons/common.qh>
 #include <server/weapons/weaponsystem.qh>

diff --git a/qcsrc/common/turrets/sv_turrets.qh b/qcsrc/common/turrets/sv_turrets.qh
index f7b14b0a65e5641295c962018bd6bd89ee70210f..5191940b1cc49e7244d312588bdfe42375124c58 100644 (file)
--- a/qcsrc/common/turrets/sv_turrets.qh
+++ b/qcsrc/common/turrets/sv_turrets.qh
@@ -103,3 +103,6 @@ vector tvt_thadv; // turret head angle diff vector, updated by a successful call
 vector tvt_tadv; // turret angle diff vector, updated by a successful call to turret_validate_target
 float tvt_thadf; // turret head angle diff float, updated by a successful call to turret_validate_target
 float tvt_dist; // turret distance, updated by a successful call to turret_validate_target
+
+IntrusiveList g_turrets;
+STATIC_INIT(g_turrets) { g_turrets = IL_NEW(); }

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index ed3947b537b9ed57b29b9bca215a7da6421b696a..590aba88a74e3db161e43de38b34bc3fbf1dfba0 100644 (file)
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -1,5 +1,6 @@
 #include "sv_vehicles.qh"
 
+#include <server/bot/api.qh>
 #include <server/g_damage.qh>
 #include <server/g_world.qh>
 #include <server/items/items.qh>
@@ -1217,10 +1218,7 @@ bool vehicle_initialize(entity this, Vehicle info, bool nodrop)
                return false;
 
        if(!this.tur_head)
-       {
                info.vr_precache(info);
-               IL_PUSH(g_vehicles, this);
-       }
 
        if(this.targetname && this.targetname != "")
        {

diff --git a/qcsrc/common/viewloc.qc b/qcsrc/common/viewloc.qc
index c3d70fc509d2d992fae61b7be4d37d2af8df271b..d4f1a54a8fd38fd70b061d5e6b52f7581bcc7a1b 100644 (file)
--- a/qcsrc/common/viewloc.qc
+++ b/qcsrc/common/viewloc.qc
@@ -6,7 +6,8 @@
     #include "constants.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../server/defs.qh"
+       #include <common/weapons/_all.qh>
+       #include <common/stats.qh>
 #endif
 
 // client movement

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 8d6bb9d015e591fb8b29d0ea9d3ca9e3bc6cefee..092ef4d1ed7e1a2262f1fe4f15d43604278aa82d 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -35,7 +35,6 @@
     #include <server/items/spawning.qh>
     #include <server/autocvars.qh>
     #include <server/constants.qh>
-    #include <server/defs.qh>
     #include "../notifications/all.qh"
     #include "../deathtypes/all.qh"
     #include <server/mutators/_mod.qh>

diff --git a/qcsrc/common/weapons/weapon/minelayer.qh b/qcsrc/common/weapons/weapon/minelayer.qh
index b822eee68a162a3f327003d4f02e3a3318ab31a6..dc79d74ac70ab380798bed7b2ab602a6aef3d248 100644 (file)
--- a/qcsrc/common/weapons/weapon/minelayer.qh
+++ b/qcsrc/common/weapons/weapon/minelayer.qh
@@ -63,4 +63,7 @@ void W_MineLayer_Think(entity this);
 .float minelayer_detonate, mine_explodeanyway;
 .float mine_time;
 .vector mine_orientation;
+
+IntrusiveList g_mines;
+STATIC_INIT(g_mines) { g_mines = IL_NEW(); }
 #endif

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 0487c617617b5368d20d9ea6fec08395d3e52cb5..ee70983f8f58b4c1a36761ef37b898c7a271c2b4 100644 (file)
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -10,7 +10,8 @@
        #include <common/mapobjects/teleporters.qh>
        #include <common/util.qh>
        #include <server/constants.qh>
-       #include <server/defs.qh>
+       #include <common/weapons/_all.qh>
+       #include <common/stats.qh>
        #include <server/utils.qh>
 #endif
 

diff --git a/qcsrc/server/anticheat.qc b/qcsrc/server/anticheat.qc
index be517fe232fad66b2c7e3e4c30e1996143a3bf9c..c0d1cc10e783e0f7d9581061dc56aabdcb9fcd34 100644 (file)
--- a/qcsrc/server/anticheat.qc
+++ b/qcsrc/server/anticheat.qc
@@ -2,7 +2,8 @@
 
 #include "antilag.qh"
 #include "autocvars.qh"
-#include "defs.qh"
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/client.qh>
 #include <server/gamelog.qh>
 #include <server/sv_main.qh>

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index 93ca6acf93eba5b7204c3dd0d4353a5b4a9901dd..d116bc10918b97fa480d665a1745bc23a765d2f8 100644 (file)
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -2,8 +2,11 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
+    #include <server/weapons/common.qh>
     #include <common/state.qh>
+    #include <common/monsters/sv_monsters.qh>
     #include <common/vehicles/all.qh>
        #include <lib/warpzone/common.qh>
     #include "antilag.qh"

diff --git a/qcsrc/server/bot/api.qh b/qcsrc/server/bot/api.qh
index 873c2ac62ad4bd179be2afad7526e2e4ea89fbb4..5ee3963cbbe21d00d3d6ac546214da98a0d16a24 100644 (file)
--- a/qcsrc/server/bot/api.qh
+++ b/qcsrc/server/bot/api.qh
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <common/weapons/_all.qh>
 #include <common/physics/player.qh>
 
@@ -143,3 +144,13 @@ void waypoint_lock(entity pl);
 
 void waypoint_getSymmetricalOrigin_cmd(entity caller, bool save, int arg_idx);
 void waypoint_getSymmetricalAxis_cmd(entity caller, bool save, int arg_idx);
+
+IntrusiveList g_waypoints;
+IntrusiveList g_bot_targets;
+IntrusiveList g_bot_dodge;
+STATIC_INIT(botapi)
+{
+       g_waypoints = IL_NEW();
+       g_bot_targets = IL_NEW();
+       g_bot_dodge = IL_NEW();
+}

diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc
index 21506d07523e406f0a5591d84f4c302668321f15..fc6755fb040e2d31edeed6de13d19989677a8f8b 100644 (file)
--- a/qcsrc/server/bot/default/aim.qc
+++ b/qcsrc/server/bot/default/aim.qc
@@ -1,6 +1,7 @@
 #include "aim.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 
 #include "cvars.qh"
 

diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index 9462339a2b3c92a4d44997f90ca03ec6e99d32b2..9d526b74db23220274985dace5b55ec009ded3c9 100644 (file)
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -17,7 +17,7 @@
 #include "../../campaign.qh"
 #include "../../client.qh"
 #include "../../constants.qh"
-#include "../../defs.qh"
+#include <common/stats.qh>
 #include <server/g_world.qh>
 #include <server/g_damage.qh>
 #include "../../race.qh"

diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc
index 341ba7ac6ca5f18efe17c95a5ad7482e8e14c669..f6917bdb4d41e2fa9e5c52b9b6dbef24df3336f2 100644 (file)
--- a/qcsrc/server/bot/default/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qc
@@ -2,9 +2,12 @@
 
 #include "roles.qh"
 
+#include <server/bot/api.qh>
 #include <server/client.qh>
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/g_damage.qh>
+#include <server/items/items.qh>
 #include <server/miscfunctions.qh>
 #include <server/weapons/selection.qh>
 #include <server/weapons/weaponsystem.qh>

diff --git a/qcsrc/server/bot/default/havocbot/roles.qc b/qcsrc/server/bot/default/havocbot/roles.qc
index 33d6ec1e7518182e29a367db5c404f1ecde75e27..9c95fb87ba8d955fa6a2af70115f465b5ec1ca2d 100644 (file)
--- a/qcsrc/server/bot/default/havocbot/roles.qc
+++ b/qcsrc/server/bot/default/havocbot/roles.qc
@@ -1,6 +1,7 @@
 #include "roles.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include <server/items/items.qh>
 #include <server/items/spawning.qh>

diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index 4b65a69ccd292177fe9c345887a199acb428eed0..cf7cd99c2199f6e49b1761d5c060404b51dde7ad 100644 (file)
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -1,6 +1,8 @@
 #include "navigation.qh"
 
-#include <server/defs.qh>
+#include <server/bot/api.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include "cvars.qh"
 

diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc
index 65935cd68d11c7176d82077d160c633065880217..94c849650f9bbc47b73cfdee073a1a668ae25366 100644 (file)
--- a/qcsrc/server/bot/default/scripting.qc
+++ b/qcsrc/server/bot/default/scripting.qc
@@ -1,6 +1,7 @@
 #include "scripting.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include <server/weapons/selection.qh>
 #include <server/weapons/weaponsystem.qh>

diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index b4e6df09c60b50fd27e6ff540d810b19d53f6625..a9069a0b158ac58cdf394339c28ac171781bf285 100644 (file)
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -1,7 +1,10 @@
 #include "waypoints.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
+#include <server/items/items.qh>
 #include <server/miscfunctions.qh>
+#include <server/spawnpoints.qh>
 #include "cvars.qh"
 
 #include "bot.qh"

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index 784288a6ee555b50dbf6637f238f0b4a4168bc92..92d183a4515094da1f4626cc3ff84dfeb73bfe6a 100644 (file)
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -1,6 +1,7 @@
 #include "campaign.qh"
 
-#include "defs.qh"
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 
 #include "cheats.qh"
 #include "miscfunctions.qh"

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 1c9d0b880a0865ab14f8354a4e5148bb94ec8579..dc41fac73ad11aa701b7d51518f7aa9f8cf8db03 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -1,6 +1,7 @@
 #include "cheats.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include <common/effects/all.qh>
 #include <server/resources.qh>

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 5c8baee6d3a7da1b1fd27ec0a963924afb98a288..3707c9e484717d184b67c433c4ba117e610ec9ab 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1,6 +1,7 @@
 #include "client.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include <common/effects/all.qh>
 #include "anticheat.qh"

diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh
index 0961e01fa3088a8c2107884b18dae2f92e63bee1..8d4afe4ba6d21ee237dd527c5a5535c04e079832 100644 (file)
--- a/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@ -356,6 +356,9 @@ void FixClientCvars(entity e);
 // called when a client connects, useful for updating sounds and such of static objects
 .void(entity this, entity player) init_for_player;
 
+IntrusiveList g_initforplayer;
+STATIC_INIT(g_initforplayer) { g_initforplayer = IL_NEW(); }
+
 /// \brief Print the string to the client's chat.
 /// \param[in] client Client to print to.
 /// \param[in] text Text to print.

diff --git a/qcsrc/server/clientkill.qc b/qcsrc/server/clientkill.qc
index f3e7b52d6f96baac725fa68d8b30428c8885903c..600faed5a3776d9f9891f7358b495f306e91e963 100644 (file)
--- a/qcsrc/server/clientkill.qc
+++ b/qcsrc/server/clientkill.qc
@@ -1,7 +1,9 @@
 #include "clientkill.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/client.qh>
+#include <server/player.qh>
 
 #include "g_damage.qh"
 #include "teamplay.qh"

diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc
index 42de51882e81d8f6f39d2d1585875028604ea3db..962a8a1a8c203551e5af591a87f27ca6c3ec54f1 100644 (file)
--- a/qcsrc/server/command/banning.qc
+++ b/qcsrc/server/command/banning.qc
@@ -1,6 +1,7 @@
 #include "banning.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include <common/state.qh>
 #include <common/command/_mod.qh>

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index 8fd39070fd293fbd9be39bc5efc3ffd3e959198a..48f1cd16825103b4e48dcef3ebe48e53e8307a59 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -1,7 +1,8 @@
 #include "common.qh"
 
 #include <server/client.qh>
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>
 

diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc
index 215920f24d39169e579b8e8037188b97d811b2ee..c5a26e8c92b7d598032409ff4942fcc75b240a15 100644 (file)
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -1,6 +1,7 @@
 #include "getreplies.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>
 

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index b31b4ed0de1521c908e01d646fdf286bdf7fa13f..2ad5c05106a691053b0b3e346cba21c56c556aef 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -1,7 +1,8 @@
 #include "vote.qh"
 
 #include <server/client.qh>
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/gamelog.qh>
 #include <server/miscfunctions.qh>
 

diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh
index 99f0acb3ee6b5b1ec5bbcf3356455e6f2010df2a..55068ab462cc804e05017141e98a0eff606d3833 100644 (file)
--- a/qcsrc/server/command/vote.qh
+++ b/qcsrc/server/command/vote.qh
@@ -58,3 +58,6 @@ void ReadyCount();
 void ReadyRestart_force();
 void VoteCount(float first_count);
 void Nagger_Init();
+
+IntrusiveList g_saved_team;
+STATIC_INIT(g_saved_team) { g_saved_team = IL_NEW(); }

diff --git a/qcsrc/server/compat/quake.qc b/qcsrc/server/compat/quake.qc
index c80da0af3772cf40ddd744cf1c471f0268702e23..d2eb785b584fec3a810ad6d6405aff25413bdd96 100644 (file)
--- a/qcsrc/server/compat/quake.qc
+++ b/qcsrc/server/compat/quake.qc
@@ -1,6 +1,7 @@
 #include "quake.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include <common/weapons/_all.qh>
 

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 0433636d6195818aba776195b079313cfcfae542..de97cba569b0b7e0f0d86d7d87535a36267e37fc 100644 (file)
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -1,7 +1,8 @@
 #include "quake3.qh"
 
 #include <server/client.qh>
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include <server/items/items.qh>
 #include <server/items/spawning.qh>

diff --git a/qcsrc/server/compat/wop.qc b/qcsrc/server/compat/wop.qc
index bd399bffd3d15c861e60922edf0fb83e7e177f8f..4b7a6d31b30ee480b6f0a1054d729216b2730547 100644 (file)
--- a/qcsrc/server/compat/wop.qc
+++ b/qcsrc/server/compat/wop.qc
@@ -1,6 +1,7 @@
 #include "wop.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include <server/items/spawning.qh>
 #include <common/weapons/_all.qh>

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
deleted file mode 100644 (file)
index 9931513..0000000
--- a/qcsrc/server/defs.qh
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-
-////
-
-IntrusiveList g_monsters;
-IntrusiveList g_waypoints;
-IntrusiveList g_vehicles;
-IntrusiveList g_turrets;
-IntrusiveList g_mines;
-IntrusiveList g_projectiles;
-IntrusiveList g_items;
-IntrusiveList g_initforplayer;
-IntrusiveList g_clones;
-IntrusiveList g_spawnpoints;
-IntrusiveList g_bot_targets;
-IntrusiveList g_bot_dodge;
-IntrusiveList g_damagedbycontents;
-IntrusiveList g_railgunhit;
-IntrusiveList g_ladders;
-IntrusiveList g_locations;
-IntrusiveList g_saved_team;
-IntrusiveList g_monster_targets;
-IntrusiveList g_pathlib_nodes;
-IntrusiveList g_moveables;
-STATIC_INIT(defs)
-{
-       g_monsters = IL_NEW();
-       g_waypoints = IL_NEW();
-       g_vehicles = IL_NEW();
-       g_turrets = IL_NEW();
-       g_mines = IL_NEW();
-       g_projectiles = IL_NEW();
-       g_items = IL_NEW();
-       g_initforplayer = IL_NEW();
-       g_clones = IL_NEW();
-       g_spawnpoints = IL_NEW();
-       g_bot_targets = IL_NEW();
-       g_bot_dodge = IL_NEW();
-       g_damagedbycontents = IL_NEW();
-       g_railgunhit = IL_NEW();
-       g_ladders = IL_NEW();
-       g_locations = IL_NEW();
-       g_saved_team = IL_NEW();
-       g_monster_targets = IL_NEW();
-       g_pathlib_nodes = IL_NEW();
-       g_moveables = IL_NEW();
-}

diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh
index fb2120db1209bdfc27851393ede0b0a0f0a65471..2348c7ad6b707759ca15c5dcf94b9d930a067ab7 100644 (file)
--- a/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@ -3,7 +3,8 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
     #include <server/items/items.qh>
     #include <server/miscfunctions.qh>
     #include <lib/warpzone/common.qh>
@@ -16,7 +17,6 @@
     #include "weapons/selection.qh"
     #include "autocvars.qh"
     #include "constants.qh"
-    #include "defs.qh"
     #include <common/notifications/all.qh>
     #include <common/deathtypes/all.qh>
     #include <server/mutators/_mod.qh>
@@ -158,3 +158,6 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt);
 void Fire_ApplyDamage(entity e);
 
 void Fire_ApplyEffect(entity e);
+
+IntrusiveList g_damagedbycontents;
+STATIC_INIT(g_damagedbycontents) { g_damagedbycontents = IL_NEW(); }

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index 79572f63bddb9ee3dc93213a28953bf853e6eb18..57947200a6b819cdf3653af6a7027d00259b2783 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -1,6 +1,8 @@
 #include "g_hook.qh"
 
-#include <server/defs.qh>
+#include <server/bot/api.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/g_damage.qh>
 #include <server/miscfunctions.qh>
 #include <common/effects/all.qh>

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 9f78b6750431dee07f31e161a69eb4dac954774c..e258e351a79892f5e9c8199dd4fada280f12e6b0 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -22,6 +22,7 @@
 #include "spawnpoints.qh"
 #include "teamplay.qh"
 #include "weapons/weaponstats.qh"
+#include <server/weapons/common.qh>
 #include "../common/constants.qh"
 #include <common/net_linked.qh>
 #include "../common/deathtypes/all.qh"

diff --git a/qcsrc/server/g_world.qh b/qcsrc/server/g_world.qh
index f99619208758a435c2330657d4eb39731919c878..3bbaad68246e942d4288f379d326686a6cb970ae 100644 (file)
--- a/qcsrc/server/g_world.qh
+++ b/qcsrc/server/g_world.qh
@@ -60,3 +60,6 @@ void Map_MarkAsRecent(string m);
 float DoNextMapOverride(float reinit);
 void CheckRules_World();
 float RedirectionThink();
+
+IntrusiveList g_moveables;
+STATIC_INIT(g_moveables) { g_moveables = IL_NEW(); }

diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc
index a7786f6b660eac467b1d7ea689dfb0f4dac98f92..bb19b0c701bca4273b1a7cf5f70fd4035761a3eb 100644 (file)
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@ -1,10 +1,10 @@
 #include "ipban.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include "autocvars.qh"
 #include "command/banning.qh"
-#include "defs.qh"
 #include "../common/constants.qh"
 #include "../common/util.qh"
 

diff --git a/qcsrc/server/items/items.qh b/qcsrc/server/items/items.qh
index 41d901f0d9d4bc22c96fd7d2e580debc5e0ffec9..8dbb47283d59532ba96cc952dfbc6b503923eb61 100644 (file)
--- a/qcsrc/server/items/items.qh
+++ b/qcsrc/server/items/items.qh
@@ -109,3 +109,6 @@ spawnfunc(target_items);
 #define POSTGIVE_VALUE_ROT(e,f,t,rotfield,rottime,regenfield,regentime,snd_incr,snd_decr) GiveRot((e), save_##f, (e).f, rotfield, rottime, regenfield, regentime); GiveSound((e), save_##f, (e).f, t, snd_incr, snd_decr)
 
 float GiveItems(entity e, float beginarg, float endarg);
+
+IntrusiveList g_items;
+STATIC_INIT(g_items) { g_items = IL_NEW(); }

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index 8d747e254e5f8a9da7afa9043019e097c206f6e4..2286b60a48ff4bed4f09cbc429584dbfa8540674 100644 (file)
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -1,7 +1,8 @@
 #include "mapvoting.qh"
 
 #include <server/client.qh>
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/gamelog.qh>
 #include <server/miscfunctions.qh>
 #include "g_world.qh"

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index a2409290f2ff11ae5d8a5456029a84c4f8c3cf61..45cb058d8c549c2c01982ce9424b69a99117dd7e 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -11,6 +11,7 @@
 #include "ipban.qh"
 #include <server/items/items.qh>
 #include <server/mutators/_mod.qh>
+#include <server/spawnpoints.qh>
 #include <server/sv_main.qh>
 #include "mapvoting.qh"
 #include "resources.qh"
@@ -31,6 +32,7 @@
 #include "../common/teams.qh"
 #include "../common/mapobjects/subs.qh"
 #include <common/mapobjects/trigger/hurt.qh>
+#include <common/mapobjects/target/location.qh>
 #include "../common/util.qh"
 #include "../common/turrets/sv_turrets.qh"
 #include <common/weapons/_all.qh>

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index aab5081d5f4d45beb837ba15a7a06808ae9672ef..6d317a71c03af6c1c3602175b96941da32756e32 100644 (file)
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/client.qh>
 #include <server/g_world.qh>
 

diff --git a/qcsrc/server/mutators/loader.qc b/qcsrc/server/mutators/loader.qc
index 7c20b372906b842661b3abfa2e577a88448af81f..f15098766fe069e8b26db3edcb3328508e23d96f 100644 (file)
--- a/qcsrc/server/mutators/loader.qc
+++ b/qcsrc/server/mutators/loader.qc
@@ -1,6 +1,7 @@
 #include "loader.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 
 STATIC_INIT_LATE(Gametype) {

diff --git a/qcsrc/server/pathlib/main.qc b/qcsrc/server/pathlib/main.qc
index 4cb8a3806c6883f32cb8550abc9388eda50cef5a..b42e5ef688ec39f2e1879adc8966b0819e61102d 100644 (file)
--- a/qcsrc/server/pathlib/main.qc
+++ b/qcsrc/server/pathlib/main.qc
@@ -1,6 +1,7 @@
 #include "main.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include "pathlib.qh"
 #include "utility.qh"

diff --git a/qcsrc/server/pathlib/movenode.qc b/qcsrc/server/pathlib/movenode.qc
index 796581767f763148fae53f1acf2c924400b1a1ac..06568ae0d3d99f3a3dbdde94e956262ec219bbdf 100644 (file)
--- a/qcsrc/server/pathlib/movenode.qc
+++ b/qcsrc/server/pathlib/movenode.qc
@@ -1,7 +1,8 @@
 #include "movenode.qh"
 
 #include <common/mapobjects/triggers.qh>
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include "pathlib.qh"
 #include "utility.qh"

diff --git a/qcsrc/server/pathlib/pathlib.qh b/qcsrc/server/pathlib/pathlib.qh
index da07e93aaed34d457992384333ee7cc4e41b55e7..edfb98b2a2104962d736327f377037a1d8d5c13a 100644 (file)
--- a/qcsrc/server/pathlib/pathlib.qh
+++ b/qcsrc/server/pathlib/pathlib.qh
@@ -105,3 +105,6 @@ var bool  pathlib_makenode(entity parent,vector start, vector to, vector goal,fl
 var bool  buildpath_nodefilter(vector n,vector c,vector p);
 
 var float  pathlib_wpp_waypointcallback(entity wp, entity wp_prev);
+
+IntrusiveList g_pathlib_nodes;
+STATIC_INIT(g_pathlib_nodes) { g_pathlib_nodes = IL_NEW(); }

diff --git a/qcsrc/server/pathlib/utility.qc b/qcsrc/server/pathlib/utility.qc
index 151fb44b56abec6096379d63b351b42a315e7d9a..51d3f65c9e8f3e8b2dcf7d9789727c9a1573f486 100644 (file)
--- a/qcsrc/server/pathlib/utility.qc
+++ b/qcsrc/server/pathlib/utility.qc
@@ -1,6 +1,7 @@
 #include "utility.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include "pathlib.qh"
 

diff --git a/qcsrc/server/player.qh b/qcsrc/server/player.qh
index aa1f6dcf2992e2f40f1413ae5c014fddbc32435b..86433d456f726c62b2d37218b0d3f713e992b7fa 100644 (file)
--- a/qcsrc/server/player.qh
+++ b/qcsrc/server/player.qh
@@ -20,3 +20,6 @@ void PlayerCorpseDamage(entity this, entity inflictor, entity attacker, float da
 void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force);
 
 bool PlayerHeal(entity targ, entity inflictor, float amount, float limit);
+
+IntrusiveList g_clones;
+STATIC_INIT(g_clones) { g_clones = IL_NEW(); }

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index 4190c208ed273d8cc82dc1e32667685bd5a75301..7b99d916a5a6c443711f7196187f2678a86f0bfb 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -1,6 +1,7 @@
 #include "race.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/g_damage.qh>
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index d9cea92db92609eaa72432f03eebe91cee61ff6c..18bb5f76cb50d6f91ecd67bcec11bb16445e0ff2 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -1,7 +1,7 @@
 #include "scores.qh"
 
 #include "command/common.qh"
-#include "defs.qh"
+#include <common/weapons/_all.qh>
 #include "client.qh"
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>

diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index 39dbd49a35ddc630c85c849624330e1785d30d01..7511162aa57748ab2f3385185c3bd26f541b814f 100644 (file)
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -1,6 +1,7 @@
 #include "scores_rules.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include "client.qh"
 #include "scores.qh"

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index b81cb590a11c44af1dfb61bb36852af231e49b07..9884ec75ea019eb0b651dd84a45c028826daee18 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -4,7 +4,8 @@
 #include "g_world.qh"
 #include "miscfunctions.qh"
 #include "race.qh"
-#include "defs.qh"
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include "../common/constants.qh"
 #include <common/net_linked.qh>
 #include "../common/teams.qh"

diff --git a/qcsrc/server/spawnpoints.qh b/qcsrc/server/spawnpoints.qh
index 1221db6b2f599f94ac769aba765461b3da39f0df..39b5492c5e2aab8cfad6b48f0655d0abf4a83139 100644 (file)
--- a/qcsrc/server/spawnpoints.qh
+++ b/qcsrc/server/spawnpoints.qh
@@ -22,3 +22,6 @@ USING(spawn_evalfunc_t, vector(entity this, entity player, entity spot, vector c
 .spawn_evalfunc_t spawn_evalfunc;
 
 .int restriction;
+
+IntrusiveList g_spawnpoints;
+STATIC_INIT(g_spawnpoints) { g_spawnpoints = IL_NEW(); }

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index e43eb532054c73ab41311c17645429e220ab61bc..4969c51058bdabd930f5fa09505a09f6f3486431 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -13,6 +13,7 @@
 
 #include <server/mutators/_mod.qh>
 #include "weapons/csqcprojectile.qh"
+#include <server/weapons/common.qh>
 #include <server/compat/quake3.qh>
 
 #include "../common/constants.qh"

diff --git a/qcsrc/server/tests.qh b/qcsrc/server/tests.qh
index ecd6bc57a717ebad684510da84c300ae9cc18029..7124b1895f5c8082cd3992ef00ca0b34de214a26 100644 (file)
--- a/qcsrc/server/tests.qh
+++ b/qcsrc/server/tests.qh
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "defs.qh"
 #include "miscfunctions.qh"
 #include "autocvars.qh"
 #include "client.qh"

diff --git a/qcsrc/server/weapons/accuracy.qh b/qcsrc/server/weapons/accuracy.qh
index 5d10e85bdf8dc5d8d74ed468ca20ffc38f466000..d1665b2bd1dadc5f5de95bd925a2c828d5789646 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qh
+++ b/qcsrc/server/weapons/accuracy.qh
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 
 .bool cvar_cl_accuracy_data_share;

diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index 465900e0bd6999e9d692f4645049dea8f5809445..4c9f78422e0872d21c0c1ae0867728fec354aee6 100644 (file)
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -1,6 +1,7 @@
 #include "common.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/g_damage.qh>
 #include <server/items/items.qh>
 #include <server/miscfunctions.qh>

diff --git a/qcsrc/server/weapons/common.qh b/qcsrc/server/weapons/common.qh
index 840e6e54d61433334aaa9ebc2a2d3a960c9bc926..83df91eaaf902dc9701a924dd2b97130b3f2810f 100644 (file)
--- a/qcsrc/server/weapons/common.qh
+++ b/qcsrc/server/weapons/common.qh
@@ -33,3 +33,6 @@ const int MIF_GUIDED_TAG = BIT(7);
 const int MIF_GUIDED_ALL = MIF_GUIDED_MANUAL | MIF_GUIDED_HEAT | MIF_GUIDED_LASER | MIF_GUIDED_AI | MIF_GUIDED_TAG;
 const int MIF_GUIDED_TRACKING = MIF_GUIDED_HEAT | MIF_GUIDED_LASER | MIF_GUIDED_AI | MIF_GUIDED_TAG;
 const int MIF_GUIDED_CONFUSABLE = MIF_GUIDED_HEAT | MIF_GUIDED_AI;
+
+IntrusiveList g_projectiles;
+STATIC_INIT(g_projectiles) { g_projectiles = IL_NEW(); }

diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc
index 504bbd4510785f5e9530743412b409dd32c22e2f..758cd51ab33163d8c1265810218a316c24285235 100644 (file)
--- a/qcsrc/server/weapons/csqcprojectile.qc
+++ b/qcsrc/server/weapons/csqcprojectile.qc
@@ -1,6 +1,7 @@
 #include "csqcprojectile.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/items/items.qh>
 #include <server/miscfunctions.qh>
 

diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc
index a6c9da66c453178c26b3a08548988fb3370aafc7..eca09ebaa0d0a1255046d4cc62306e995b5ea680 100644 (file)
--- a/qcsrc/server/weapons/hitplot.qc
+++ b/qcsrc/server/weapons/hitplot.qc
@@ -1,7 +1,8 @@
 #include "hitplot.qh"
 
 #include <server/client.qh>
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>
 #include "../antilag.qh"

diff --git a/qcsrc/server/weapons/selection.qh b/qcsrc/server/weapons/selection.qh
index 94987d20a4087bbbbf0226e235e6cfaa585d7cf6..03c203f4e3e20d16454a28eac0ba9278e87e5ab1 100644 (file)
--- a/qcsrc/server/weapons/selection.qh
+++ b/qcsrc/server/weapons/selection.qh
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 
 .int selectweapon; // last selected weapon of the player

diff --git a/qcsrc/server/weapons/spawning.qh b/qcsrc/server/weapons/spawning.qh
index d435002ad69fb3c6784bc68f210051afae856df4..eb40bfc40f24a432b94536cc16862959239dd192 100644 (file)
--- a/qcsrc/server/weapons/spawning.qh
+++ b/qcsrc/server/weapons/spawning.qh
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 
 string W_Apply_Weaponreplace(string in);

diff --git a/qcsrc/server/weapons/throwing.qh b/qcsrc/server/weapons/throwing.qh
index 20732753e4fe66f11c1fdd802df01eda300fc658..8ebd4080ca172b6edbac7676eafa268a52bc0e24 100644 (file)
--- a/qcsrc/server/weapons/throwing.qh
+++ b/qcsrc/server/weapons/throwing.qh
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 
 .float savenextthink;

diff --git a/qcsrc/server/weapons/tracing.qh b/qcsrc/server/weapons/tracing.qh
index c786798ac18253a71b87e703c1730ec0405df800..67246859c0bb043063991ef6da145e37289b9dbf 100644 (file)
--- a/qcsrc/server/weapons/tracing.qh
+++ b/qcsrc/server/weapons/tracing.qh
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 
 vector w_shotorg;
@@ -69,6 +70,9 @@ void W_SetupProjVelocity_Explicit(entity proj, vector dir, vector upDir, float p
 .float railgunhitsolidbackup;
 .vector railgunhitloc;
 
+IntrusiveList g_railgunhit;
+STATIC_INIT(g_railgunhit) { g_railgunhit = IL_NEW(); }
+
 .float railgundistance;
 .vector railgunforce;
 void FireRailgunBullet (entity this, .entity weaponentity, vector start, vector end, float bdamage, bool headshot_notify, float bforce, float mindist, float maxdist, float halflifedist, float forcehalflifedist, int deathtype);

diff --git a/qcsrc/server/weapons/weaponstats.qc b/qcsrc/server/weapons/weaponstats.qc
index 296d10fa6bd0bef9b26f857c6e86ed4db684b9f7..eadd6f4bc83017e6a675b78301ed59d3731468f9 100644 (file)
--- a/qcsrc/server/weapons/weaponstats.qc
+++ b/qcsrc/server/weapons/weaponstats.qc
@@ -1,6 +1,7 @@
 #include "weaponstats.qh"
 
-#include <server/defs.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 #include <server/miscfunctions.qh>
 #include "../g_world.qh"