From 2ce2f533321210bef1f49b1245a8ea1fda15eea4 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sat, 10 Oct 2015 19:35:02 +1100 Subject: [PATCH] #includes: cleanup server --- qcsrc/client/commands/all.qc | 2 -- qcsrc/client/csqc_constants.qh | 3 --- qcsrc/common/monsters/monster.qh | 11 +++++++++++ qcsrc/common/monsters/monster/mage.qc | 5 +++++ qcsrc/common/monsters/monster/shambler.qc | 6 ++++++ qcsrc/common/monsters/monster/spider.qc | 3 +++ qcsrc/common/monsters/monster/wyvern.qc | 1 + qcsrc/common/monsters/monster/zombie.qc | 2 ++ qcsrc/common/monsters/sv_monsters.qh | 3 +++ qcsrc/common/triggers/func/breakable.qc | 2 -- qcsrc/common/triggers/misc/laser.qc | 1 - qcsrc/common/triggers/target/music.qc | 1 - qcsrc/common/triggers/target/spawn.qc | 1 - qcsrc/common/triggers/teleporters.qc | 1 - qcsrc/common/triggers/trigger/jumppads.qc | 1 - qcsrc/common/triggers/trigger/secret.qc | 1 - qcsrc/common/triggers/trigger/swamp.qc | 1 - qcsrc/server/bot/aim.qc | 3 ++- qcsrc/server/bot/bot.qc | 3 ++- qcsrc/server/bot/havocbot/havocbot.qc | 4 +++- qcsrc/server/bot/havocbot/role_keyhunt.qc | 1 - qcsrc/server/bot/havocbot/roles.qc | 1 - qcsrc/server/bot/navigation.qc | 5 ++++- qcsrc/server/bot/scripting.qc | 3 ++- qcsrc/server/bot/waypoints.qc | 2 +- qcsrc/server/cheats.qc | 1 - qcsrc/server/cl_client.qc | 1 + qcsrc/server/cl_impulse.qc | 8 ++++++-- qcsrc/server/cl_player.qc | 4 +++- qcsrc/server/command/banning.qc | 1 - qcsrc/server/command/cmd.qc | 5 ++++- qcsrc/server/command/cmd.qh | 3 --- qcsrc/server/command/common.qc | 3 ++- qcsrc/server/command/getreplies.qc | 1 - qcsrc/server/command/radarmap.qc | 2 +- qcsrc/server/command/sv_cmd.qc | 1 - qcsrc/server/command/vote.qc | 1 - qcsrc/server/controlpoint.qc | 4 ++++ qcsrc/server/ent_cs.qc | 3 ++- qcsrc/server/g_damage.qc | 4 +++- qcsrc/server/g_hook.qc | 4 +++- qcsrc/server/g_lights.qc | 3 ++- qcsrc/server/g_models.qc | 3 ++- qcsrc/server/g_subs.qc | 2 +- qcsrc/server/g_violence.qc | 3 ++- qcsrc/server/g_world.qc | 3 ++- qcsrc/server/ipban.qc | 1 - qcsrc/server/item_key.qc | 1 - qcsrc/server/mapvoting.qc | 1 - qcsrc/server/miscfunctions.qc | 4 +++- qcsrc/server/mutators/gamemode.qh | 1 + qcsrc/server/mutators/gamemode_assault.qc | 2 +- qcsrc/server/mutators/gamemode_ca.qc | 1 - qcsrc/server/mutators/gamemode_ctf.qc | 6 ++++-- qcsrc/server/mutators/gamemode_cts.qc | 1 - qcsrc/server/mutators/gamemode_deathmatch.qc | 2 ++ qcsrc/server/mutators/gamemode_domination.qc | 5 +++-- qcsrc/server/mutators/gamemode_freezetag.qc | 1 - qcsrc/server/mutators/gamemode_invasion.qc | 3 ++- qcsrc/server/mutators/gamemode_keepaway.qc | 4 +++- qcsrc/server/mutators/gamemode_keyhunt.qc | 1 - qcsrc/server/mutators/gamemode_lms.qc | 1 - qcsrc/server/mutators/gamemode_nexball.qc | 6 +++++- qcsrc/server/mutators/gamemode_onslaught.qc | 5 ++++- qcsrc/server/mutators/gamemode_race.qc | 1 - qcsrc/server/mutators/gamemode_tdm.qc | 1 - qcsrc/server/mutators/mutator_bloodloss.qc | 1 - qcsrc/server/mutators/mutator_breakablehook.qc | 3 +++ qcsrc/server/mutators/mutator_buffs.qc | 5 ++++- qcsrc/server/mutators/mutator_campcheck.qc | 1 - qcsrc/server/mutators/mutator_dodging.qc | 2 +- qcsrc/server/mutators/mutator_instagib.qc | 3 ++- qcsrc/server/mutators/mutator_instagib_items.qc | 4 +++- qcsrc/server/mutators/mutator_invincibleproj.qc | 1 - qcsrc/server/mutators/mutator_melee_only.qc | 1 - qcsrc/server/mutators/mutator_midair.qc | 1 - qcsrc/server/mutators/mutator_multijump.qc | 2 +- qcsrc/server/mutators/mutator_nades.qc | 2 +- qcsrc/server/mutators/mutator_new_toys.qc | 1 - qcsrc/server/mutators/mutator_nix.qc | 1 - qcsrc/server/mutators/mutator_overkill.qc | 1 - qcsrc/server/mutators/mutator_physical_items.qc | 1 - qcsrc/server/mutators/mutator_pinata.qc | 1 - qcsrc/server/mutators/mutator_random_gravity.qc | 1 - qcsrc/server/mutators/mutator_rocketflying.qc | 1 - qcsrc/server/mutators/mutator_rocketminsta.qc | 3 +++ qcsrc/server/mutators/mutator_spawn_near_teammate.qc | 1 - qcsrc/server/mutators/mutator_superspec.qc | 1 - qcsrc/server/mutators/mutator_touchexplode.qc | 1 - qcsrc/server/mutators/mutator_vampire.qc | 1 - qcsrc/server/mutators/sandbox.qc | 1 - qcsrc/server/pathlib/_all.inc | 5 +++++ qcsrc/server/pathlib/debug.qc | 1 - qcsrc/server/pathlib/main.qc | 9 ++++++++- qcsrc/server/pathlib/movenode.qc | 3 ++- qcsrc/server/pathlib/pathlib.qh | 5 ----- qcsrc/server/portals.qc | 4 +++- qcsrc/server/race.qc | 4 +++- qcsrc/server/round_handler.qc | 1 - qcsrc/server/scores.qc | 1 - qcsrc/server/scores_rules.qc | 1 - qcsrc/server/spawnpoints.qc | 3 ++- qcsrc/server/sv_main.qc | 2 +- qcsrc/server/t_items.qc | 1 - qcsrc/server/t_items.qh | 4 ++++ qcsrc/server/t_quake.qc | 1 - qcsrc/server/t_quake3.qc | 4 +++- qcsrc/server/teamplay.qc | 1 - qcsrc/server/teamplay.qh | 2 ++ qcsrc/server/weapons/accuracy.qc | 1 - qcsrc/server/weapons/common.qc | 2 +- qcsrc/server/weapons/csqcprojectile.qc | 1 - qcsrc/server/weapons/hitplot.qc | 2 +- qcsrc/server/weapons/selection.qc | 3 ++- qcsrc/server/weapons/spawning.qc | 1 - qcsrc/server/weapons/throwing.qc | 3 ++- qcsrc/server/weapons/tracing.qc | 2 +- qcsrc/server/weapons/weaponstats.qc | 1 - qcsrc/server/weapons/weaponsystem.qc | 3 ++- 119 files changed, 171 insertions(+), 116 deletions(-) diff --git a/qcsrc/client/commands/all.qc b/qcsrc/client/commands/all.qc index dcace6593..45d9eaaa8 100644 --- 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 1df447283..584f001f8 100644 --- 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 0a78b7772..84253b1e9 100644 --- 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 9952063f6..fd1c9bb85 100644 --- 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 937c83c9e..30e0fe428 100644 --- 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 35a320b9d..93252a39a 100644 --- 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 102fd6a5c..4acf2093b 100644 --- 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 8425a123a..2300f78f6 100644 --- 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 d1d224363..acf94eb7d 100644 --- 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 af9a6b423..a0d266ce5 100644 --- 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 3b9996db6..cc15516d1 100644 --- 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 41edbb718..257de8be5 100644 --- 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 10fe3c764..b95837127 100644 --- 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 94f2bd26b..438292a43 100644 --- 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 a54824028..931ff9cee 100644 --- 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 d16d2773c..285ba62a9 100644 --- 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 2ae068d82..029ee9630 100644 --- 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 4f750cdb4..07ea9091d 100644 --- 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 c033daeec..dbcd90052 100644 --- 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 f69527916..ec27e3e94 100644 --- 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 b1603c792..0059dc97a 100644 --- 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 037968f13..a4357628e 100644 --- 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 99e3901b2..36171eddf 100644 --- 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 72951cd66..c3484e1d4 100644 --- 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 8f50d0276..ffd78e931 100644 --- 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 aa87763ca..c17a1d0c8 100644 --- 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 71efa5f9d..ad0d71db3 100644 --- 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 a594c83c7..8b36e1753 100644 --- 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 e94ba6283..13d7b6227 100644 --- 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 add929004..f325dcd72 100644 --- 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 f849deb6a..9cf020d33 100644 --- 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 0e04ce781..1f2365822 100644 --- 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 5ddea150a..7dea85ee6 100644 --- 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 1371e8010..b3eeb1a69 100644 --- 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 8c15819e0..50b09f799 100644 --- 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 d08588ff9..21255e5dd 100644 --- 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 c92ffd3e8..60faeb3c2 100644 --- 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 7f17228fa..ceeb4f185 100644 --- 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 768eae30b..548c60429 100644 --- 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 5cae69239..8f9b30504 100644 --- 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 ec6699428..d372d3516 100644 --- 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 bd5232a1c..8399b5fdb 100644 --- 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 20020261c..a9353cfe1 100644 --- 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 585ac42e0..8544cd926 100644 --- 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 2a885f901..b016acdd6 100644 --- 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 75c61d2ee..cb9aaa3c1 100644 --- 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 f185d4aef..a60970d21 100644 --- 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 713fbf6c3..fc0dbd422 100644 --- 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 a8e027df1..5a9f7e076 100644 --- 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 57bbd51d0..ccefc4c1e 100644 --- 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 d2066b9ab..2ee316d8c 100644 --- 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 1a10e3c6c..85d975fbc 100644 --- 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 570fc3801..e01b6e574 100644 --- 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 108b8dda6..78c192433 100644 --- 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 f9b478232..175950dd8 100644 --- 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 06afc516b..c3c8b0df5 100644 --- 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 34b287510..9e309f6e4 100644 --- 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 e7790c974..85ef5119f 100644 --- 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 5209b225f..0929d93a5 100644 --- 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 b265e41d3..b4951c6e7 100644 --- 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 be45c3db0..68097755e 100644 --- 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 b9395b913..b3cf0db6a 100644 --- 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 f65e05843..6d5cd7600 100644 --- 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 ebfc22bb5..03de8eb6b 100644 --- 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 d51b33ec2..271456986 100644 --- 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 451e4a55c..2ff647db0 100644 --- 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 da9a608f0..06bf72ea0 100644 --- 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 149b3d761..b3daba675 100644 --- 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 7aeadce75..739eeb8c9 100644 --- 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 e4ad5ba19..8cfb06440 100644 --- 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 b5dc32fdf..e9dd6fd73 100644 --- 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 9f88b2b6e..dc1d0eba5 100644 --- 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 87abd78a2..deecb1467 100644 --- 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 e7c066afc..2855a074f 100644 --- 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 fb8aac419..019eeb801 100644 --- 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 3ac730317..33ae58f4d 100644 --- 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 04e60bb83..de6296d82 100644 --- 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 4fdbbd353..1a07f5e7c 100644 --- 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 9b51d9abb..93b64ebcc 100644 --- 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 5339d319e..2a26d9326 100644 --- 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 d2086215f..96376e24b 100644 --- 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 144a8d2ea..d1272319e 100644 --- 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 71262b923..4c450a85c 100644 --- 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 060ed74f8..ff85f2905 100644 --- 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 5f684b353..c403e9f9c 100644 --- 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 07148cc58..4a4daa3c3 100644 --- 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 e3178b338..c996f1a12 100644 --- 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 32e81319d..e0b5ad35d 100644 --- 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 faa74bb1d..e78b0d78f 100644 --- 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 6b2859f44..b5cad57ae 100644 --- 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 ed3ffc5e7..7a52f0c69 100644 --- 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 8622734d0..1b15654e4 100644 --- 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 37e167aae..434f50b86 100644 --- 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 f097e8a0f..800f0335e 100644 --- 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 6645d7126..e3bcac61e 100644 --- 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 dbf785266..d88a43ed8 100644 --- 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 30fa07384..09776c4d6 100644 --- 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 fbf1eaa18..3ac5582d6 100644 --- 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 0d608f9af..e6a1334f8 100644 --- 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 14893b12d..bb489f76f 100644 --- 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 aefb1754b..07d726791 100644 --- 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 09d914a3c..ead90d30b 100644 --- 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 138051827..05fee86da 100644 --- 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 0a5785037..eee53e616 100644 --- 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 81554c4c2..8195d250d 100644 --- 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 9e22b8d06..29de5d4c7 100644 --- 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 c8f595761..94663fc36 100644 --- 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 2fbbd50b3..46b82ac65 100644 --- 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 3ce05ac2a..5664d261d 100644 --- 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 09f155ecb..baa95c649 100644 --- 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 f1720757f..d4e29cb04 100644 --- 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 ca98ad10b..1e254b804 100644 --- 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 39d91a21e..ec48c6d3c 100644 --- 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 ce2a671c4..b7eb2fe09 100644 --- 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 b011bb1ff..be2ca6b50 100644 --- 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 a649cf75b..83025da9a 100644 --- 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 69821aaaf..b88acaa51 100644 --- 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 6701f5829..ce1fb6100 100644 --- 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 ae76b36b6..3f74034f1 100644 --- 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() -- 2.39.2