From: Mario Date: Fri, 21 Sep 2018 01:57:08 +0000 (+1000) Subject: Merge branch 'master' into Mario/duel X-Git-Tag: xonotic-v0.8.5~1809^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e5d376c49510049572c7c182ba8778c8a8f80dd;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/duel --- 8e5d376c49510049572c7c182ba8778c8a8f80dd diff --cc qcsrc/server/bot/default/bot.qc index 10ececff6,2a6164a28..ec84e5516 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@@ -593,10 -593,7 +593,8 @@@ float bot_fixcount( }); } + //int player_limit = GetPlayerLimit(); // TODO: use this instead of maxclients! int bots; - // add/remove bots if needed to make sure there are at least - // minplayers+bot_number, or remove all bots if no one is playing // But don't remove bots immediately on level change, as the real players // usually haven't rejoined yet bots_would_leave = false;