Further cleanup of defs.qh

diff --git a/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc b/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
index ca92bc6229c973310c2742f273c9b518ae917b50..09d93edf013f60ae2c739ded7740b10ddb9b8cf0 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
+++ b/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
@@ -2,7 +2,9 @@
 
 #include <server/command/vote.qh>
 #include <common/mapobjects/func/breakable.qh>
+#include <common/mapobjects/triggers.qh>
 #include <server/g_damage.qh>
+#include <server/g_world.qh>
 #include <server/spawnpoints.qh>
 
 .entity sprite;

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
index e4256c68f90ecf8a65bf5415b9e3cf94e1300cc0..ec296a9c9cec51484a6c66e97c4e091928ca36f9 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
@@ -2,8 +2,10 @@
 
 #include <common/effects/all.qh>
 #include <common/mapobjects/teleporters.qh>
+#include <common/mapobjects/triggers.qh>
 #include <common/vehicles/all.qh>
 #include <server/command/vote.qh>
+#include <server/client.qh>
 #include <server/gamelog.qh>
 #include <server/g_damage.qh>
 #include <server/g_world.qh>

diff --git a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
index 991423a49685e0f3aa0eb9f368eedfd338d59e3b..34c7b26c2a70795d4a3d631c7a133fc8c4714e67 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
+++ b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
@@ -1,9 +1,11 @@
 #include "sv_cts.qh"
 
+#include <server/client.qh>
 #include <server/race.qh>
 #include <server/g_world.qh>
 #include <server/gamelog.qh>
 #include <server/items/spawning.qh>
+#include <common/mapobjects/triggers.qh>
 
 float autocvar_g_cts_finish_kill_delay;
 bool autocvar_g_cts_selfdamage;

diff --git a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
index 88e20af000bf076851aa22a52374c48dad842e04..2825bbcce0d395c44c676d22947490f9723b4b19 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
+++ b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
@@ -1,9 +1,12 @@
 #include "sv_domination.qh"
 
+#include <server/client.qh>
 #include <server/command/vote.qh>
+#include <server/g_damage.qh>
 #include <server/gamelog.qh>
 #include <server/teamplay.qh>
 #include <common/mapobjects/platforms.qh>
+#include <common/mapobjects/triggers.qh>
 
 bool g_domination;
 

diff --git a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
index a215040507d5bafe17968fb2c83b07db25174ce7..9bccb31a179c443b6057168435460bb20233dfd2 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
+++ b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
@@ -1,9 +1,11 @@
 #include "sv_invasion.qh"
 
+#include <common/mapobjects/triggers.qh>
 #include <common/monsters/sv_spawn.qh>
 #include <common/monsters/sv_spawner.qh>
 #include <common/monsters/sv_monsters.qh>
 
+#include <server/g_world.qh>
 #include <server/teamplay.qh>
 
 IntrusiveList g_invasion_roundends;

diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
index 0066af45156cd820fe160513edf5d5b01b3d6f36..63f1d24d643a33219b46882e2a3a850ebab45829 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
@@ -1,6 +1,7 @@
 #include "sv_keepaway.qh"
 
 #include <common/effects/all.qh>
+#include <server/client.qh>
 #include <server/gamelog.qh>
 #include <server/g_damage.qh>
 

diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
index df538cbe494464273ab7e2e44803467ad283ad14..dd702cb5f92eb2f33679f4b772ddf27f23c74bf5 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 <common/mapobjects/triggers.qh>
 
 float autocvar_g_balance_keyhunt_damageforcescale;
 float autocvar_g_balance_keyhunt_delay_collect;

diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
index 5af6044337d50f46c9735d960ef18f92883f6b9a..a206fcbde36aefd27fa92305b834d357a0ea770c 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
+++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
@@ -3,6 +3,7 @@
 #include <common/mutators/mutator/instagib/items.qh>
 #include <server/campaign.qh>
 #include <server/command/_mod.qh>
+#include <server/g_world.qh>
 #include <server/items/items.qh>
 
 int autocvar_g_lms_extra_lives;

diff --git a/qcsrc/common/gamemodes/gamemode/nexball/sv_nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/sv_nexball.qc
index 2144a0008b40a983eeebc456e6047c2bf977ae17..ba5911272cd99165fdab3eba8fe352416d4e8602 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/nexball/sv_nexball.qc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/sv_nexball.qc
@@ -1,8 +1,10 @@
 #include "sv_nexball.qh"
 
+#include <server/client.qh>
 #include <server/command/vote.qh>
 #include <server/gamelog.qh>
 #include <common/ent_cs.qh>
+#include <common/mapobjects/triggers.qh>
 
 .entity ballcarried;
 

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
index 975c1192fe65937515edc14d8143258810a84b87..ece18a32eed62893c56b9f4d14d4f590b94ad684 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
@@ -6,6 +6,7 @@
 #include <server/g_damage.qh>
 #include <server/items/items.qh>
 #include <common/mapobjects/defs.qh>
+#include <common/mapobjects/triggers.qh>
 
 bool g_onslaught;
 

diff --git a/qcsrc/common/gamemodes/gamemode/race/sv_race.qc b/qcsrc/common/gamemodes/gamemode/race/sv_race.qc
index 8761e26f7c311cbc46393cb8ee87b4526c704c35..f56353d0136aa5391c818b015ac8f0c4edd5be36 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/race/sv_race.qc
+++ b/qcsrc/common/gamemodes/gamemode/race/sv_race.qc
@@ -1,9 +1,11 @@
 #include "sv_race.qh"
 
+#include <server/client.qh>
 #include <server/g_world.qh>
 #include <server/gamelog.qh>
 #include <server/race.qh>
 #include <common/ent_cs.qh>
+#include <common/mapobjects/triggers.qh>
 
 #define autocvar_g_race_laps_limit cvar("g_race_laps_limit")
 float autocvar_g_race_qualifying_timelimit;

diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh
index 02151e30742ec8ea8e0c63cff58f66162c9a9c2e..5c6ec494a3d33bd92536aa5a701d7d8da2971514 100644 (file)
--- a/qcsrc/common/items/item.qh
+++ b/qcsrc/common/items/item.qh
@@ -56,6 +56,8 @@ const int ITS_GLOW              = BIT(6);
 
 .float fade_start;
 .float fade_end;
+
+.string mdl;
 #endif
 
 #ifdef SVQC

diff --git a/qcsrc/common/mapobjects/trigger/viewloc.qc b/qcsrc/common/mapobjects/trigger/viewloc.qc
index 354d36cb765ccfe72cc780949de7ab7e44bd3629..b9b63b823b42bf19087cb45b61b82dc20708ab75 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/viewloc.qc
+++ b/qcsrc/common/mapobjects/trigger/viewloc.qc
@@ -3,6 +3,7 @@
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include <lib/warpzone/util_server.qh>
+       #include <common/mapobjects/triggers.qh>
     #include <server/defs.qh>
 #endif
 

diff --git a/qcsrc/common/mapobjects/triggers.qh b/qcsrc/common/mapobjects/triggers.qh
index 2ca91a09b3d902e79b41ac3a979cc62401598386..1fac7907a57b57fa9701738373d369d70b1ce5e0 100644 (file)
--- a/qcsrc/common/mapobjects/triggers.qh
+++ b/qcsrc/common/mapobjects/triggers.qh
@@ -10,6 +10,10 @@
 
 .float lip;
 
+// handy fields used by a lot of the codebase, but more importantly used by map objects
+.float cnt;
+.float count;
+
 // used elsewhere (will fix)
 #ifdef SVQC
 .string message2;

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 974f69e5b3a3a2122295768509914e81aa4defd3..768e94b83567c3252d5dc253fe600c311a4b5583 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -21,6 +21,7 @@
 #include <server/campaign.qh>
 #include <server/cheats.qh>
 #include <server/command/_mod.qh>
+#include <common/items/_mod.qh>
 #include <common/mapobjects/teleporters.qh>
 #include "../mapobjects/triggers.qh"
 #include <lib/csqcmodel/sv_model.qh>

diff --git a/qcsrc/common/monsters/sv_spawn.qc b/qcsrc/common/monsters/sv_spawn.qc
index f4ae76df8ce919049741f1763cb6a795c5857da2..5b4e9a206120ae7af7f847e23e14ed5cd2da7636 100644 (file)
--- a/qcsrc/common/monsters/sv_spawn.qc
+++ b/qcsrc/common/monsters/sv_spawn.qc
@@ -7,6 +7,7 @@
     #include "sv_monsters.qh"
     #include <server/autocvars.qh>
     #include <server/defs.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/physics/player.qc b/qcsrc/common/physics/player.qc
index f1b15502983566d4c67a8d8e700a99e4c487d654..af1ae0ad181ad83d2ade2a7afc85c1024652ac66 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -4,6 +4,7 @@
 
 #ifdef SVQC
 
+#include <server/client.qh>
 #include <server/miscfunctions.qh>
 #include <common/mapobjects/defs.qh>
 #include "../mapobjects/trigger/viewloc.qh"

diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc
index 08ee5524e379afdf25bf845282c34211ad36bcd2..129c42d47384b6e0fe424ccb64d3118ab3a73791 100644 (file)
--- a/qcsrc/common/playerstats.qc
+++ b/qcsrc/common/playerstats.qc
@@ -5,6 +5,7 @@
     #include "constants.qh"
     #include "util.qh"
     #include <common/weapons/_all.qh>
+    #include <server/client.qh>
     #include "../server/anticheat.qh"
     #include "../server/defs.qh"
     #include "../server/scores.qh"

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index 46a604ae29698c7ecb072b0099b00162d92ae8ca..ed3947b537b9ed57b29b9bca215a7da6421b696a 100644 (file)
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -1,9 +1,12 @@
 #include "sv_vehicles.qh"
 
 #include <server/g_damage.qh>
+#include <server/g_world.qh>
 #include <server/items/items.qh>
+#include <common/items/_mod.qh>
 #include <common/mapobjects/defs.qh>
 #include <common/mapobjects/teleporters.qh>
+#include <common/mapobjects/triggers.qh>
 #include <server/sv_main.qh>
 #include <server/weapons/common.qh>
 

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 92727b4c0ad436d64165fc1060b5898d75798d5d..8d6bb9d015e591fb8b29d0ea9d3ca9e3bc6cefee 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -29,6 +29,7 @@
     #include <common/util.qh>
     #include "../monsters/_mod.qh"
     #include "config.qh"
+    #include <server/weapons/common.qh>
     #include <server/weapons/csqcprojectile.qh>
     #include <server/weapons/tracing.qh>
     #include <server/items/spawning.qh>

diff --git a/qcsrc/server/anticheat.qc b/qcsrc/server/anticheat.qc
index 7637424c158b79b6d9acc8d6de3ea07d16380988..be517fe232fad66b2c7e3e4c30e1996143a3bf9c 100644 (file)
--- a/qcsrc/server/anticheat.qc
+++ b/qcsrc/server/anticheat.qc
@@ -3,6 +3,7 @@
 #include "antilag.qh"
 #include "autocvars.qh"
 #include "defs.qh"
+#include <server/client.qh>
 #include <server/gamelog.qh>
 #include <server/sv_main.qh>
 #include "miscfunctions.qh"

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 9167ca5e7753cb165b52474559df0223c4a0cbc1..1c9d0b880a0865ab14f8354a4e5148bb94ec8579 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -24,6 +24,8 @@
 
 #include "../common/monsters/_mod.qh"
 
+#include <common/items/_mod.qh>
+
 #include <common/weapons/_all.qh>
 
 #include "../common/mapobjects/subs.qh"

diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh
index 0823e9214749499feaeecc8d1fb1304be9e6d868..0961e01fa3088a8c2107884b18dae2f92e63bee1 100644 (file)
--- a/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@ -52,6 +52,11 @@
 
 .int pressedkeys;
 
+.int playerid;
+
+.string playermodel;
+.string playerskin;
+
 void ClientState_attach(entity this);
 
 IntrusiveList g_players;
@@ -307,6 +312,8 @@ bool independent_players;
 float blockSpectators; // if set, new or existing spectators or observers will be removed unless they become a player within g_maxplayers_spectator_blocktime seconds
 .float spectatortime; // point in time since the client is spectating or observing
 
+.bool player_blocked;
+
 // TODO: standardise resource regeneration
 .float pauseregen_finished;
 .float pauserothealth_finished;

diff --git a/qcsrc/server/clientkill.qc b/qcsrc/server/clientkill.qc
index 51b133636756d558d79cae3d7371d5617a99660d..f3e7b52d6f96baac725fa68d8b30428c8885903c 100644 (file)
--- a/qcsrc/server/clientkill.qc
+++ b/qcsrc/server/clientkill.qc
@@ -1,11 +1,13 @@
 #include "clientkill.qh"
 
 #include <server/defs.qh>
+#include <server/client.qh>
 
 #include "g_damage.qh"
 #include "teamplay.qh"
 
 #include <common/vehicles/sv_vehicles.qh>
+#include <common/mapobjects/triggers.qh>
 #include <common/notifications/all.qh>
 #include <common/stats.qh>
 

diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index e3dbf795f60541f9482f4997c42b28b540552837..7ec8eb6ea157bf0a1706251c2b26da5b754393b6 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -2,6 +2,7 @@
 #ifdef RADARMAP
 
 #include <common/command/_mod.qh>
+#include <common/mapobjects/triggers.qh>
 
 #include "../g_world.qh"
 

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index d65ebf2a54c7c8efd9eb11185d574fdfba97996b..9931513dae1b18e515ee6c633ac5055aba94e612 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -3,39 +3,6 @@
 #include <common/weapons/_all.qh>
 #include <common/stats.qh>
 
-// Fields
-
-.float pain_finished;                  //Added by Supajoe
-
-.float cnt; // used in too many places
-.float count;
-
-.float fade_time;
-.float fade_rate;
-
-.string mdl;
-
-.string playermodel;
-.string playerskin;
-
-.float species;
-
-// string overrides entity
-.string item_pickupsound;
-.entity item_pickupsound_ent;
-.entity item_model_ent;
-
-.float winning;
-
-.int playerid;
-
-float default_player_alpha;
-float default_weapon_alpha;
-
-.entity realowner;
-
-.bool player_blocked;
-
 ////
 
 IntrusiveList g_monsters;

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 30e8d51aeaca83843e3f868a7ee08653a576fd9e..f5d5f91bc43197cbf321a499fb17d5e5eb671e41 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -25,6 +25,7 @@
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include <common/mapobjects/defs.qh>
+#include <common/mapobjects/triggers.qh>
 #include "../common/notifications/all.qh"
 #include "../common/physics/movetypes/movetypes.qh"
 #include "../common/playerstats.qh"

diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh
index f6ae1d5e075069e40732912dfd8141bd228c74c8..fb2120db1209bdfc27851393ede0b0a0f0a65471 100644 (file)
--- a/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@ -51,6 +51,8 @@ float yoda;
 float damage_goodhits;
 float damage_gooddamage;
 
+.float pain_finished; // Added by Supajoe
+
 .float dmg_team;
 .float teamkill_complain;
 .float teamkill_soundtime;

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 00ee7205bfd1e2281a65055be2cde17cb44100a1..9f78b6750431dee07f31e161a69eb4dac954774c 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -36,6 +36,7 @@
 #include "../common/playerstats.qh"
 #include "../common/stats.qh"
 #include "../common/teams.qh"
+#include <common/mapobjects/triggers.qh>
 #include "../common/mapobjects/trigger/secret.qh"
 #include "../common/mapobjects/target/music.qh"
 #include "../common/util.qh"

diff --git a/qcsrc/server/g_world.qh b/qcsrc/server/g_world.qh
index ceb7a4a4b95b09dc4453efd47da009a098943fd9..f99619208758a435c2330657d4eb39731919c878 100644 (file)
--- a/qcsrc/server/g_world.qh
+++ b/qcsrc/server/g_world.qh
@@ -29,10 +29,14 @@ float alreadychangedlevel;
 string cache_mutatormsg;
 string cache_lastmutatormsg;
 
+float default_player_alpha;
+float default_weapon_alpha;
+
 // database
 float ServerProgsDB;
 float TemporaryDB;
 
+.float winning;
 const int WINNING_NO = 0; // no winner, but time limits may terminate the game
 const int WINNING_YES = 1; // winner found
 const int WINNING_NEVER = 2; // no winner, enter overtime if time limit is reached

diff --git a/qcsrc/server/items/items.qh b/qcsrc/server/items/items.qh
index 0fbfab3ecc2b7a538e6b0ed59cc38eb8e38ba9c7..41d901f0d9d4bc22c96fd7d2e580debc5e0ffec9 100644 (file)
--- a/qcsrc/server/items/items.qh
+++ b/qcsrc/server/items/items.qh
@@ -13,6 +13,11 @@ bool have_pickup_item(entity this);
 
 const float ITEM_RESPAWN_TICKS = 10;
 
+// string overrides entity
+.string item_pickupsound;
+.entity item_pickupsound_ent;
+.entity item_model_ent;
+
 .float max_armorvalue;
 .float pickup_anyway;
 

diff --git a/qcsrc/server/pathlib/movenode.qc b/qcsrc/server/pathlib/movenode.qc
index cbcfe3d4c6038f07c00abb44047019d6988748a3..796581767f763148fae53f1acf2c924400b1a1ac 100644 (file)
--- a/qcsrc/server/pathlib/movenode.qc
+++ b/qcsrc/server/pathlib/movenode.qc
@@ -1,5 +1,6 @@
 #include "movenode.qh"
 
+#include <common/mapobjects/triggers.qh>
 #include <server/defs.qh>
 #include <server/miscfunctions.qh>
 #include "pathlib.qh"

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 3795066fe5502494bc48361776dc405da79aa882..ba19f16a74c3d8b6c83d8e86797e295bc233e323 100644 (file)
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -6,11 +6,13 @@
 #include "client.qh"
 #include "clientkill.qh"
 #include "g_damage.qh"
+#include "g_world.qh"
 #include "handicap.qh"
 #include "miscfunctions.qh"
 #include "portals.qh"
 #include "teamplay.qh"
 #include <server/sv_main.qh>
+#include "weapons/common.qh"
 #include "weapons/throwing.qh"
 #include "command/common.qh"
 #include "command/vote.qh"

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 6e997d6b3329aa923c9f31793160d1d1cfc54a2d..7edbc6f996b39d185806bb53c449bfe3d5734265 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -4,10 +4,12 @@
 #include "g_hook.qh"
 #include "mutators/_mod.qh"
 #include <server/client.qh>
+#include <server/weapons/common.qh>
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/notifications/all.qh"
 #include "../common/mapobjects/teleporters.qh"
+#include <common/mapobjects/triggers.qh>
 #include "../common/mapobjects/subs.qh"
 #include "../common/util.qh"
 #include <common/weapons/_all.qh>

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index d2eeecbb4cfe9d819c4cb77563fbc90993e851db..4190c208ed273d8cc82dc1e32667685bd5a75301 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -4,6 +4,7 @@
 #include <server/g_damage.qh>
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>
+#include <server/weapons/common.qh>
 #include "client.qh"
 #include "cheats.qh"
 #include "portals.qh"

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index e5a8b3007a2ab4aea8d1244eb79b6c40d38a98d7..aab069cba9eda86431705111967ace4391eec20e 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -4,6 +4,7 @@
 #include <server/miscfunctions.qh>
 #include "campaign.qh"
 #include "command/vote.qh"
+#include <common/mapobjects/triggers.qh>
 #include "../common/util.qh"
 
 void round_handler_Think(entity this)

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 12c0a6b3cc6d60bc96a89b940a0a439cb08f25ae..b81cb590a11c44af1dfb61bb36852af231e49b07 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -11,6 +11,7 @@
 #include <common/gamemodes/_mod.qh>
 #include "../common/mapobjects/subs.qh"
 #include "../common/mapobjects/target/spawnpoint.qh"
+#include <common/mapobjects/triggers.qh>
 #include "../common/util.qh"
 #include "../lib/warpzone/common.qh"
 #include "../lib/warpzone/util_server.qh"

diff --git a/qcsrc/server/sv_main.qh b/qcsrc/server/sv_main.qh
index 628684585f95ba47ad7db2823125992caf2e5adc..dc3d80dbea81f83548c0cd977a68fcd75d6e70bb 100644 (file)
--- a/qcsrc/server/sv_main.qh
+++ b/qcsrc/server/sv_main.qh
@@ -14,6 +14,7 @@ float servertime, serverprevtime, serverframetime;
 .float watersound_finished;
 
 .bool iscreature;
+.float species;
 
 .float contents_damagetime;
 

diff --git a/qcsrc/server/weapons/common.qh b/qcsrc/server/weapons/common.qh
index d26eb5cb8a2ad37c3496ef0af7a0e389a5f64a34..840e6e54d61433334aaa9ebc2a2d3a960c9bc926 100644 (file)
--- a/qcsrc/server/weapons/common.qh
+++ b/qcsrc/server/weapons/common.qh
@@ -12,6 +12,11 @@ void W_PrepareExplosionByDamage(entity this, entity attacker, void(entity this)
 
 .int projectiledeathtype;
 
+.float fade_time;
+.float fade_rate;
+
+.entity realowner;
+
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // when doing this, hagar can go through clones
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX

diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc
index b90a855e1cd90a6a25c28f598522f23f8168f48f..a6c9da66c453178c26b3a08548988fb3370aafc7 100644 (file)
--- a/qcsrc/server/weapons/hitplot.qc
+++ b/qcsrc/server/weapons/hitplot.qc
@@ -1,5 +1,6 @@
 #include "hitplot.qh"
 
+#include <server/client.qh>
 #include <server/defs.qh>
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>

diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc
index 3f362016d37f7a5cdf2eafe7ed1930e224273641..17fd9e0e0ab59ff19d53fbd642b9e954cb44ff87 100644 (file)
--- a/qcsrc/server/weapons/selection.qc
+++ b/qcsrc/server/weapons/selection.qc
@@ -9,6 +9,7 @@
 #include <common/items/item.qh>
 #include <common/weapons/_all.qh>
 #include <common/state.qh>
+#include <common/mapobjects/triggers.qh>
 #include <common/mutators/mutator/waypoints/waypointsprites.qh>
 #include <common/wepent.qh>
 

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index ef1b6bd68d81880e15f018ec4217e4f3fe81b7d4..2d9972551d7832385cb2512f0b2fe9af988b03d0 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -8,6 +8,7 @@
 #include "weaponsystem.qh"
 
 #include "../g_damage.qh"
+#include <server/sv_main.qh>
 #include "../antilag.qh"
 
 #include <common/constants.qh>

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index cbfba4c9f3ef4ae7b2b75d29b4bb559a53c7ab44..81b25e845f81879b46a9fac4118e9fac5ae5e3b7 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -3,7 +3,9 @@
 #include "selection.qh"
 
 #include "../command/common.qh"
+#include <server/client.qh>
 #include <server/g_damage.qh>
+#include <server/g_world.qh>
 #include <server/items/items.qh>
 #include <server/mutators/_mod.qh>
 #include "../round_handler.qh"
@@ -11,6 +13,7 @@
 #include <server/resources.qh>
 #include <common/animdecide.qh>
 #include <common/constants.qh>
+#include <common/items/_mod.qh>
 #include <common/net_linked.qh>
 #include <common/mapobjects/platforms.qh>
 #include <common/monsters/_mod.qh>