Merge branch 'drjaska/whitelist_weaponarena' into 'master'

whitelist g_*_weaponarena "most" and "most_available"

See merge request xonotic/xonotic-data.pk3dir!1103

diff --combined qcsrc/server/world.qc
index c04b188fa4cd6addfb74e65809b6e2522d56c11f,c80317d6e78c4c27b9072dbb6a75b37ca192b77b..43758c5f474b72331ccc6cbbdefe73b32b53ab6d
--- 1/qcsrc/server/world.qc
--- 2/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@@ -170,6 -170,7 +170,7 @@@ void cvar_changes_init(
  #define BADPRESUFFIX(p,s) if(substring(k, 0, strlen(p)) == p && substring(k, -strlen(s), -1) == s) continue
  #define BADCVAR(p) if(k == p) continue
  #define BADVALUE(p, val) if (k == p && v == val) continue
+ #define BADPRESUFFIXVALUE(p,s,val) if(substring(k, 0, strlen(p)) == p && substring(k, -strlen(s), -1) == s && v == val) continue
  
                // general excludes and namespaces for server admin used cvars
                BADPREFIX("help_"); // PN's server has this listed as changed, let's not rat him out for THAT
@@@ -285,7 -286,6 +286,7 @@@
                BADCVAR("g_keyhunt");
                BADCVAR("g_keyhunt_teams");
                BADCVAR("g_lms");
 +              BADCVAR("g_mayhem");
                BADCVAR("g_nexball");
                BADCVAR("g_onslaught");
                BADCVAR("g_race");
@@@ -300,8 -300,6 +301,8 @@@
                BADCVAR("g_tdm");
                BADCVAR("g_tdm_on_dm_maps");
                BADCVAR("g_tdm_teams");
 +              BADCVAR("g_tmayhem");
 +              BADCVAR("g_tmayhem_teams");
                BADCVAR("g_vip");
                BADCVAR("leadlimit");
                BADCVAR("nextmap");
@@@ -379,10 -377,6 +380,10 @@@
                BADCVAR("g_spawn_alloweffects");
                BADCVAR("g_tdm_point_leadlimit");
                BADCVAR("g_tdm_point_limit");
 +              BADCVAR("g_mayhem_point_limit");
 +              BADCVAR("g_mayhem_point_leadlimit");
 +              BADCVAR("g_tmayhem_point_limit");
 +              BADCVAR("g_tmayhem_point_leadlimit");
                BADCVAR("leadlimit_and_fraglimit");
                BADCVAR("leadlimit_override");
                BADCVAR("pausable");
@@@ -460,7 -454,6 +461,7 @@@
                BADCVAR("g_keyhunt_point_limit");
                BADCVAR("g_keyhunt_teams_override");
                BADCVAR("g_lms_lives_override");
 +              BADCVAR("g_mayhem_powerups");
                BADCVAR("g_maplist");
                BADCVAR("g_maxplayers");
                BADCVAR("g_mirrordamage");
@@@ -477,8 -470,6 +478,8 @@@
                BADCVAR("g_start_delay");
                BADCVAR("g_superspectate");
                BADCVAR("g_tdm_teams_override");
 +              BADCVAR("g_tmayhem_teams_override");
 +              BADCVAR("g_tmayhem_powerups");
                BADCVAR("g_weapon_stay"); BADPRESUFFIX("g_", "_weapon_stay");
                BADCVAR("hostname");
                BADCVAR("log_file");
@@@ -522,6 -513,9 +523,9 @@@
                BADPREFIX("sv_info_");
                BADPREFIX("sv_ready_restart_");
  
+               BADPRESUFFIXVALUE("g_", "_weaponarena", "most");
+               BADPRESUFFIXVALUE("g_", "_weaponarena", "most_available");
+ 
                // mutators that announce themselves properly to the server browser
                BADCVAR("g_instagib");
                BADCVAR("g_new_toys");
@@@ -533,6 -527,7 +537,7 @@@
  #undef BADPREFIX
  #undef BADCVAR
  #undef BADVALUE
+ #undef BADPRESUFFIXVALUE
  
                if(pureadding)
                {
@@@ -670,9 -665,10 +675,9 @@@ void GameplayMode_DelayedInit(entity th
                        int u = AVAILABLE_TEAMS - d;
                        map_minplayers += (u < d && u + map_minplayers <= m) ? u : -d;
                }
 -              warmup_limit = -1;
        }
        else
 -              map_minplayers = 0; // don't display a minimum if it's not used
 +              map_minplayers = 0; // don't display a minimum if it's not used (g_maxplayers < 0 && g_warmup >= 0)
  }
  
  void InitGameplayMode()
@@@ -744,7 -740,8 +749,7 @@@ spawnfunc(worldspawn
        {
                if (!server_is_dedicated)
                {
 -                      // force unloading of server pk3 files when starting a listen server
 -                      // localcmd("\nfs_rescan\n"); // FIXME: does more harm than good, has unintended side effects. What we really want is to unload temporary pk3s only
 +                      // DP unloads dlcache pk3s before starting a listen server since https://gitlab.com/xonotic/darkplaces/-/merge_requests/134
                        // restore csqc_progname too
                        string expect = "csprogs.dat";
                        wantrestart = cvar_string("csqc_progname") != expect;
@@@ -873,6 -870,9 +878,6 @@@
  
        GameRules_limit_fallbacks();
  
 -      if(warmup_limit == 0)
 -              warmup_limit = autocvar_timelimit * 60;
 -
        player_count = 0;
        bot_waypoints_for_items = autocvar_g_waypoints_for_items;
        if(bot_waypoints_for_items == 1)
@@@ -2105,27 -2105,13 +2110,27 @@@ void readlevelcvars(
        if(cvar("sv_allow_fullbright"))
                serverflags |= SERVERFLAG_ALLOW_FULLBRIGHT;
  
 -      sv_ready_restart_after_countdown = cvar("sv_ready_restart_after_countdown");
 +      serverflags &= ~SERVERFLAG_FORBID_PICKUPTIMER;
 +      if(cvar("sv_forbid_pickuptimer"))
 +              serverflags |= SERVERFLAG_FORBID_PICKUPTIMER;
  
 -      warmup_stage = cvar("g_warmup");
 -      warmup_limit = cvar("g_warmup_limit");
 +      sv_ready_restart_after_countdown = cvar("sv_ready_restart_after_countdown");
  
        if(cvar("g_campaign"))
                warmup_stage = 0; // no warmup during campaign
 +      else
 +      {
 +              warmup_stage = autocvar_g_warmup;
 +              if (warmup_stage < 0 || warmup_stage > 1)
 +                      warmup_limit = -1; // don't start until there's enough players
 +              else if (warmup_stage == 1)
 +              {
 +                      // this code is duplicated in ReadyCount()
 +                      warmup_limit = cvar("g_warmup_limit");
 +                      if(warmup_limit == 0)
 +                              warmup_limit = autocvar_timelimit * 60;
 +              }
 +      }
  
        g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
        g_pickup_respawntime_superweapon = cvar("g_pickup_respawntime_superweapon");
@@@ -2278,20 -2264,11 +2283,20 @@@ void DropToFloor_Handler(entity this
                return;
        }
  
 -      vector end = this.origin - '0 0 256';
 +      vector end = this.origin;
 +      if (autocvar_sv_mapformat_is_quake3)
 +              end.z -= 4096;
 +      else if (autocvar_sv_mapformat_is_quake2)
 +              end.z -= 128;
 +      else
 +              end.z -= 256; // Quake, QuakeWorld
  
        // NOTE: SV_NudgeOutOfSolid is used in the engine here
        if(autocvar_sv_gameplayfix_droptofloorstartsolid_nudgetocorrect)
 +      {
 +              _Movetype_UnstickEntity(this);
                move_out_of_solid(this);
 +      }
  
        tracebox(this.origin, this.mins, this.maxs, end, MOVE_NORMAL, this);
  
@@@ -2315,10 -2292,7 +2320,10 @@@
                        LOG_DEBUGF("DropToFloor_Handler: %v fixed badly placed entity", this.origin);
                        setorigin(this, trace_endpos);
                        if(autocvar_sv_gameplayfix_droptofloorstartsolid_nudgetocorrect)
 +                      {
 +                              _Movetype_UnstickEntity(this);
                                move_out_of_solid(this);
 +                      }
                        SET_ONGROUND(this);
                        this.groundentity = trace_ent;
                        // if support is destroyed, keep suspended (gross hack for floating items in various maps)