Merge branch 'master' into terencehill/less_entities

diff --cc qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
index 492da41b14034ca00be29f55efdd6c9fda75f6b0,58954905c2106af96bccee9c7c201724e1f846f9..5c55350cb397fc32b36a402b4c43cc8e6e9d43c8
--- 1/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
--- 2/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
@@@ -1,14 -1,16 +1,20 @@@
  #pragma once
  
  #include "ctf.qh"
 -
+ #include <common/items/item/pickup.qh>
+ #include <common/mutators/base.qh>
+ #include <common/gamemodes/sv_rules.qh>
  
 +CLASS(Flag, Pickup)
 +    ATTRIB(Flag, m_mins, vector, (PL_MIN_CONST + '0 0 -13') * 1.4); // scaling be damned
 +    ATTRIB(Flag, m_maxs, vector, (PL_MAX_CONST + '0 0 -13') * 1.4);
 +ENDCLASS(Flag)
 +Flag CTF_FLAG;
  void ctf_Initialize();
  
+ int autocvar_captureleadlimit_override;
+ int autocvar_capturelimit_override;
+ 
  REGISTER_MUTATOR(ctf, false)
  {
      MUTATOR_STATIC();

diff --cc qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
index bb1c9aee948fe2fcd01d838a47889e5bb3103dc3,993eb936f4a0622d5fe7019dfda644484b33c201..1d872bb7fe49afee17410713e72802873d6f64f2
--- 1/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
--- 2/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
+++ b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
@@@ -4,8 -5,20 +5,10 @@@
  #include <common/monsters/sv_spawner.qh>
  #include <common/monsters/sv_monsters.qh>
  
+ #include <server/bot/api.qh>
+ #include <server/world.qh>
  #include <server/teamplay.qh>
  
 -IntrusiveList g_invasion_roundends;
 -IntrusiveList g_invasion_waves;
 -IntrusiveList g_invasion_spawns;
 -STATIC_INIT(g_invasion)
 -{
 -      g_invasion_roundends = IL_NEW();
 -      g_invasion_waves = IL_NEW();
 -      g_invasion_spawns = IL_NEW();
 -}
 -
  float autocvar_g_invasion_round_timelimit;
  float autocvar_g_invasion_spawnpoint_spawn_delay;
  float autocvar_g_invasion_warmup;

diff --cc qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qh
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh
index 52eec4abcc7a93ac6c133d0b08478f1aca145c86,363c0e39f885ee6eefbfd645a91b189f96e90414..d472dd99956600fcd64202812a06b1fb2a3bfac4
--- 1/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh
--- 2/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh
@@@ -1,7 -1,8 +1,9 @@@
  #pragma once
  
+ #include <common/mutators/base.qh>
+ 
  float autocvar_g_onslaught_point_limit;
 +IntrusiveList g_onsshields;
  void ons_Initialize();
  
  REGISTER_MUTATOR(ons, false)

diff --cc qcsrc/common/gamemodes/sv_rules.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
index a9eac2423240f561e93494bb459d07c6a1939479,13403b9e35a96d71004db020336fadcdbd9e41b7..34a16b8a7aefba01b7e994f9b035085015386dee
--- 1/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
--- 2/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
+++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
@@@ -14,9 -14,18 +14,8 @@@ bool autocvar_g_instagib_ammo_convert_c
  bool autocvar_g_instagib_ammo_convert_rockets;
  bool autocvar_g_instagib_ammo_convert_shells;
  bool autocvar_g_instagib_ammo_convert_bullets;
- int autocvar_g_instagib_extralives;
  float autocvar_g_instagib_speed_highspeed;
  
 -IntrusiveList g_instagib_items;
 -STATIC_INIT(instagib)
 -{
 -      g_instagib_items = IL_NEW();
 -      IL_PUSH(g_instagib_items, ITEM_VaporizerCells);
 -      IL_PUSH(g_instagib_items, ITEM_ExtraLife);
 -      IL_PUSH(g_instagib_items, ITEM_Invisibility);
 -      IL_PUSH(g_instagib_items, ITEM_Speed);
 -}
 -
  void instagib_invisibility(entity this)
  {
        this.strength_finished = autocvar_g_instagib_invisibility_time;

diff --cc qcsrc/common/mutators/mutator/instagib/sv_instagib.qh
index d01abd080e05be7726407aa0bd11cd16c81463fc,f50f0f947c521f7a436c27758bae5d66624b3ddf..5467a44ee48e2c94dce945d7d5f90fea4c897954
--- 1/qcsrc/common/mutators/mutator/instagib/sv_instagib.qh
--- 2/qcsrc/common/mutators/mutator/instagib/sv_instagib.qh
+++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qh
@@@ -7,9 -30,8 +30,9 @@@ int autocvar_g_instagib_extralives
  void instagib_invisibility(entity this);
  void instagib_extralife(entity this);
  void instagib_speed(entity this);
 +IntrusiveList g_instagib_items;
  
- REGISTER_MUTATOR(mutator_instagib, autocvar_g_instagib && !g_nexball)
+ REGISTER_MUTATOR(mutator_instagib, autocvar_g_instagib && !MapInfo_LoadedGametype.m_weaponarena)
  {
        MUTATOR_ONADD
        {

diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qh
index 9ee809df65197d123a24d74edb8d090d7ab67ccf,4712ec2fadf1016e574e24628eeaf921ec588f5c..32f48ea15e292ae6f725c2114d52f02ce4e7a95a
--- 1/qcsrc/common/mutators/mutator/overkill/sv_overkill.qh
--- 2/qcsrc/common/mutators/mutator/overkill/sv_overkill.qh
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qh
@@@ -7,9 -7,8 +7,9 @@@ bool autocvar_g_overkill_filter_armorbi
  bool autocvar_g_overkill_filter_armormega;
  
  .float ok_item;
 +IntrusiveList g_overkill_items;
  
- REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !MUTATOR_IS_ENABLED(mutator_instagib) && !g_nexball && cvar_string("g_mod_balance") == "Overkill")
+ REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !MUTATOR_IS_ENABLED(mutator_instagib) && !MapInfo_LoadedGametype.m_weaponarena && cvar_string("g_mod_balance") == "Overkill")
  {
        MUTATOR_ONADD
        {

diff --cc qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc
Simple merge

diff --cc qcsrc/common/sounds/all.inc
Simple merge

diff --cc qcsrc/server/teamplay.qc
index 81c97fcab9315e04e45117a6816902a516740416,7b2027589cca326d0a13f53561678e0fba770e39..6c45ab431417d644ecd9f3caeaeb28cb01f38e4f
--- 1/qcsrc/server/teamplay.qc
--- 2/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -46,13 -46,11 +46,13 @@@ string autocvar_g_forced_team_pink
  
  entity g_team_entities[NUM_TEAMS]; ///< Holds global team entities.
  
 -STATIC_INIT(g_team_entities)
 +void Team_InitTeams()
  {
 +      if (g_team_entities[0])
 +              return;
        for (int i = 0; i < NUM_TEAMS; ++i)
        {
-               g_team_entities[i] = spawn();
+               g_team_entities[i] = new_pure();
        }
  }
  

diff --cc qcsrc/server/teamplay.qh
Simple merge