Merge branch 'master' into martin-t/available

diff --cc gamemodes-server.cfg
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
index 95f760c47c53a8316293ef35cf7ef9e50393286e,cf2821844aa01666e3b3fb2a62df7b0d900cefc5..4721cb38015ea7cb4ea306accd3f3389eaa14d14
--- 1/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
--- 2/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
@@@ -497,6 -502,14 +497,14 @@@ MUTATOR_HOOKFUNCTION(ca, GetPlayerStatu
  
  MUTATOR_HOOKFUNCTION(ca, SetWeaponArena)
  {
 -      // most weapons arena
 -      if (M_ARGV(0, string) == "0" || M_ARGV(0, string) == "") M_ARGV(0, string) = "most";
 +      if (M_ARGV(0, string) == "0" || M_ARGV(0, string) == "")
 +              M_ARGV(0, string) = autocvar_g_ca_weaponarena;
  }
+ 
+ MUTATOR_HOOKFUNCTION(ca, SV_ParseServerCommand)
+ {
+       string cmd_name = M_ARGV(0, string);
+       if (cmd_name == "shuffleteams")
+               shuffleteams_on_reset_map = !allowed_to_spawn;
+       return false;
+ }

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

diff --cc qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
Simple merge

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

diff --cc qcsrc/common/stats.qh
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
index 23b2d669365785bb5cf0af7866bde8a2a5ed3d8d,854e39781f11794e7c3aca8c3065f8761d8630b5..a59f4afa231380a58cc9f5e24fd6b7e76dd6e0b5
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -521,87 -525,6 +524,87 @@@ float want_weapon(entity weaponinfo, fl
        return t;
  }
  
-               if(w & 1)
 +/// Weapons the player normally starts with outside weapon arena.
 +WepSet weapons_start()
 +{
 +      WepSet ret = '0 0 0';
 +      FOREACH(Weapons, it != WEP_Null, {
 +              int w = want_weapon(it, false);
-               if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED))
++              if (w & 1)
 +                      ret |= it.m_wepset;
 +      });
 +      return ret;
 +}
 +
 +WepSet weapons_all()
 +{
 +      WepSet ret = '0 0 0';
 +      FOREACH(Weapons, it != WEP_Null, {
-               if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && (it.spawnflags & WEP_FLAG_NORMAL) && !(it.spawnflags & WEP_FLAG_HIDDEN))
++              if (!(it.spawnflags & (WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_SPECIALATTACK)))
 +                      ret |= it.m_wepset;
 +      });
 +      return ret;
 +}
 +
 +WepSet weapons_devall()
 +{
 +      WepSet ret = '0 0 0';
 +      FOREACH(Weapons, it != WEP_Null,
 +      {
 +              ret |= it.m_wepset;
 +      });
 +      return ret;
 +}
 +
 +WepSet weapons_most()
 +{
 +      WepSet ret = '0 0 0';
 +      FOREACH(Weapons, it != WEP_Null, {
++              if ((it.spawnflags & WEP_FLAG_NORMAL) && !(it.spawnflags & (WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_SPECIALATTACK)))
 +                      ret |= it.m_wepset;
 +      });
 +      return ret;
 +}
 +
 +void weaponarena_available_all_update(entity this)
 +{
 +      if (weaponsInMapAll)
 +      {
 +              start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_start() | (weaponsInMapAll & weapons_all());
 +      }
 +      else
 +      {
 +              // if no weapons are available on the map, just fall back to all weapons arena
 +              start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_all();
 +      }
 +}
 +
 +void weaponarena_available_devall_update(entity this)
 +{
 +      if (weaponsInMapAll)
 +      {
 +              start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_start() | weaponsInMapAll;
 +      }
 +      else
 +      {
 +              // if no weapons are available on the map, just fall back to devall weapons arena
 +              start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_devall();
 +      }
 +}
 +
 +void weaponarena_available_most_update(entity this)
 +{
 +      if (weaponsInMapAll)
 +      {
 +              start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_start() | (weaponsInMapAll & weapons_most());
 +      }
 +      else
 +      {
 +              // if no weapons are available on the map, just fall back to most weapons arena
 +              start_weapons = warmup_start_weapons = g_weaponarena_weapons = weapons_most();
 +      }
 +}
 +
  void readplayerstartcvars()
  {
        float i, t;