Add an option to count bots when getting the size restrictions on maps (enabled by...

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 4b71e28e8b4e74153e93bbf5c07f8a2497b9c692..b14eb0c8079cf837168c1f20f26c62ae7a8ead9f 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -157,6 +157,7 @@ bool autocvar_g_maplist_votable_suggestions;
 bool autocvar_g_maplist_votable_suggestions_override_mostrecent;
 float autocvar_g_maplist_votable_timeout;
 bool autocvar_g_maplist_ignore_sizes;
+bool autocvar_g_maplist_sizes_count_bots = true;
 int autocvar_g_maxplayers;
 float autocvar_g_maxplayers_spectator_blocktime;
 float autocvar_g_maxpushtime;

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 814b70e7e144f3ba9d81f0d9b4976fee923501c4..de94702f68090a1fde04bbc1d9bcf80f1acab661 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -293,6 +293,8 @@ void cvar_changes_init()
                BADCVAR("teamplay");
                BADCVAR("timelimit");
                BADCVAR("g_mapinfo_ignore_warnings");
+               BADCVAR("g_maplist_ignore_sizes");
+               BADCVAR("g_maplist_sizes_count_bots");
 
                // long
                BADCVAR("hostname");
@@ -1049,6 +1051,9 @@ bool MapHasRightSize(string map)
        // open map size restriction file
        string opensize_msg = strcat("opensize ", map);
        float fh = fopen(strcat("maps/", map, ".sizes"), FILE_READ);
+       int pcount = player_count;
+       if(!autocvar_g_maplist_sizes_count_bots)
+               pcount -= currentbots;
        if(fh >= 0)
        {
                opensize_msg = strcat(opensize_msg, ": ok, ");

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 158b32ecd597d837df4224d0dff3f96b29fa9515..f914a7b11e3bafdae0391c329811d081c8aee130 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -213,6 +213,7 @@ set g_maplist_selectrandom 0        "if 1, a random map will be chosen as next map - DE
 set g_maplist_shuffle 1        "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
 set g_maplist_check_waypoints 0        "when 1, maps are skipped if there currently are bots, but the map has no waypoints"
 set g_maplist_ignore_sizes 0 "when 1, all maps are shown in the map list regardless of player count"
+set g_maplist_sizes_count_bots 1 "include the number of bots currently in the server when counting the number of players for size restrictions"
 
 set g_items_mindist 4000 "starting distance for the fading of items"
 set g_items_maxdist 4500 "maximum distance at which an item can be viewed, after which it will be invisible"