Move some weapon definitions out of defs.qh, fix compilation units test

diff --git a/qcsrc/client/items/items.qc b/qcsrc/client/items/items.qc
index 72f69ee07f21f6a3296076686e5346d58aa589e9..06135a9f2962591fd2b833d01aa164c85ef9e6ba 100644 (file)
--- a/qcsrc/client/items/items.qc
+++ b/qcsrc/client/items/items.qc
@@ -13,6 +13,7 @@ bool autocvar_cl_ghost_items_vehicle = true;
 .vector item_glowmod;
 .bool item_simple; // probably not really needed, but better safe than sorry
 .float alpha;
+.bool pushable;
 void Item_SetAlpha(entity this)
 {
        bool veh_hud = (hud && autocvar_cl_ghost_items_vehicle);

diff --git a/qcsrc/common/mutators/mutator/new_toys/sv_new_toys.qc b/qcsrc/common/mutators/mutator/new_toys/sv_new_toys.qc
index 47e1c97a9a9a70f1df5a7214ac56e12e8080bbed..c3e0083785692ef3bf8073b2eb1c1a6db1570b87 100644 (file)
--- a/qcsrc/common/mutators/mutator/new_toys/sv_new_toys.qc
+++ b/qcsrc/common/mutators/mutator/new_toys/sv_new_toys.qc
@@ -1,6 +1,7 @@
 #include "sv_new_toys.qh"
 
 #include "../random_items/sv_random_items.qh"
+#include <server/weapons/spawning.qh>
 
 /*
 

diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
index b399d3c62f68893cc2822eb09ac23bf3a891a1aa..867da41d4ea840597c7b81b692e272740d6e3fa7 100644 (file)
--- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc
+++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
@@ -1,5 +1,7 @@
 #include "sv_nix.qh"
 
+#include <server/weapons/selection.qh>
+
 //string autocvar_g_nix;
 int autocvar_g_balance_nix_ammo_cells;
 int autocvar_g_balance_nix_ammo_plasma;

diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc
index 0ff47977762180e7eb5688d9215e3623ccd0fafe..296114539428e1758e3521976a70c26888101b95 100644 (file)
--- a/qcsrc/server/bot/default/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qc
@@ -4,6 +4,8 @@
 
 #include <server/defs.qh>
 #include <server/miscfunctions.qh>
+#include <server/weapons/selection.qh>
+#include <server/weapons/weaponsystem.qh>
 #include "../cvars.qh"
 
 #include "../aim.qh"

diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc
index 20b29a86cc10ca9ffd6b7e318acaada0a037765c..210e9710486dc7ea9624d50da6f71280e77a6297 100644 (file)
--- a/qcsrc/server/bot/default/scripting.qc
+++ b/qcsrc/server/bot/default/scripting.qc
@@ -2,6 +2,7 @@
 
 #include <server/defs.qh>
 #include <server/miscfunctions.qh>
+#include <server/weapons/selection.qh>
 #include "cvars.qh"
 
 #include <common/state.qh>

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 1e50f3edb224936e5d0047e68c801b12e4c08e8b..bbf9ec9fa43c2610b7f537f71b9424978d019f14 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -116,18 +116,6 @@ const float MAX_DAMAGEEXTRARADIUS = 16;
 
 // WEAPONTODO
 .float autoswitch;
-bool client_hasweapon(entity this, Weapon wpn, .entity weaponentity, float andammo, bool complain);
-void w_clear(Weapon thiswep, entity actor, .entity weaponentity, int fire);
-void w_ready(Weapon thiswep, entity actor, .entity weaponentity, int fire);
-// VorteX: standalone think for weapons, so normal think on weaponentity can be reserved by weaponflashes (which needs update even player dies)
-.float weapon_nextthink;
-.void(Weapon thiswep, entity actor, .entity weaponentity, int fire) weapon_think;
-
-
-// there is 2 weapon tics that can run in one server frame
-const int W_TICSPERFRAME = 2;
-
-void weapon_defaultspawnfunc(entity this, Weapon e);
 
 float intermission_running;
 float intermission_exittime;
@@ -186,8 +174,6 @@ float default_weapon_alpha;
 
 string gamemode_name;
 
-string W_Apply_Weaponreplace(string in);
-
 void FixIntermissionClient(entity e);
 void FixClientCvars(entity e);
 
@@ -296,12 +282,6 @@ string matchid;
 
 bool radar_showennemies;
 
-.float weapon_load[REGISTRY_MAX(Weapons)];
-.int ammo_none; // used by the reloading system, must always be 0
-.int clip_load;
-.int old_clip_load;
-.int clip_size;
-
 .int minelayer_mines;
 .float vortex_charge;
 .float vortex_charge_rottime;

diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index 66b5bc9d4d6c6b720dba0f32c0a18f547c762e10..ef72b964fb5cab915702883f6e558fa85c635535 100644 (file)
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -6,6 +6,8 @@
 
 #include <server/mutators/_mod.qh>
 
+#include <server/teamplay.qh>
+
 #include <server/weapons/common.qh>
 #include <server/weapons/selection.qh>
 #include <server/weapons/weaponsystem.qh>
@@ -14,10 +16,12 @@
 #include <common/deathtypes/all.qh>
 #include <common/notifications/all.qh>
 #include <common/mapobjects/subs.qh>
+#include <common/mapobjects/triggers.qh>
 #include <common/util.qh>
 
 #include <common/monsters/_mod.qh>
 
+#include <common/wepent.qh>
 #include <common/weapons/_all.qh>
 
 #include <common/mutators/mutator/buffs/buffs.qh>

diff --git a/qcsrc/server/items/items.qh b/qcsrc/server/items/items.qh
index 825bd2f019d5ff4e2cbd0a4cd4ea71c3369396ec..d135ee387de44d6c1c3a73095c55aeac6e093abb 100644 (file)
--- a/qcsrc/server/items/items.qh
+++ b/qcsrc/server/items/items.qh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <common/sounds/sound.qh>
+
 void StartItem(entity this, entity a);
 .int item_group;
 .int item_group_count;

diff --git a/qcsrc/server/items/spawning.qc b/qcsrc/server/items/spawning.qc
index bbe6622273dd6a4f669c94938002f1b4599fc405..f1c8796c7211ece944ef334be60266c8a661e7b4 100644 (file)
--- a/qcsrc/server/items/spawning.qc
+++ b/qcsrc/server/items/spawning.qc
@@ -6,6 +6,7 @@
 /// \copyright GNU GPLv2 or any later version.
 
 #include <server/mutators/_mod.qh>
+#include <server/weapons/spawning.qh>
 #include <common/weapons/all.qh>
 #include <common/mapobjects/subs.qh>
 

diff --git a/qcsrc/server/weapons/weaponsystem.qh b/qcsrc/server/weapons/weaponsystem.qh
index 986756aa510344405c4f27e9db7f9b57effef938..dd9e42a24687f49fd0a7c3d9e9d3be93b498194e 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qh
+++ b/qcsrc/server/weapons/weaponsystem.qh
@@ -1,15 +1,31 @@
 #pragma once
 
-#include <server/defs.qh>
 #include <server/miscfunctions.qh>
 
+// there is 2 weapon tics that can run in one server frame
+const int W_TICSPERFRAME = 2;
+
+// VorteX: standalone think for weapons, so normal think on weaponentity can be reserved by weaponflashes (which needs update even player dies)
+.float weapon_nextthink;
+.void(Weapon thiswep, entity actor, .entity weaponentity, int fire) weapon_think;
+
 float internalteam;
 entity weapon_dropevent_item;
 
 ..entity weaponentity_fld;
 
+.float weapon_load[REGISTRY_MAX(Weapons)];
+.int ammo_none; // used by the reloading system, must always be 0
+.int clip_load;
+.int old_clip_load;
+.int clip_size;
+
 void CL_SpawnWeaponentity(entity e, .entity weaponentity);
 
+void w_clear(Weapon thiswep, entity actor, .entity weaponentity, int fire);
+
+void w_ready(Weapon thiswep, entity actor, .entity weaponentity, int fire);
+
 vector CL_Weapon_GetShotOrg(float wpn);
 
 bool weaponUseForbidden(entity player);