From 20aa9fe950adbfb7ca30ce613a7b13f848b7d847 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 14 May 2009 12:34:24 +0000 Subject: [PATCH] make maxplayers at least bot_number+1 git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6733 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 4 ++++ data/qcsrc/menu/nexuiz/dialog_singleplayer.c | 2 +- data/qcsrc/menu/nexuiz/maplist.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index fbfa6df2c..c53732ff7 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -1258,6 +1258,10 @@ set sv_q3acompat_machineshotgunswap 0 "settemp this in mapinfo for instant Q3A m seta menu_maxplayers 8 "maxplayers value when the menu starts a game" +// command executed before loading a map by the menu +// makes sure maxplayers is at least minplayers or bot_number + 1 +alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max max def; maxplayers $_menu_loadmap_maxplayers; g_maplist_shufflenow" + // useful vote aliases set timelimit_increment 5 set timelimit_decrement 5 diff --git a/data/qcsrc/menu/nexuiz/dialog_singleplayer.c b/data/qcsrc/menu/nexuiz/dialog_singleplayer.c index 1f957de95..16a29f5a9 100644 --- a/data/qcsrc/menu/nexuiz/dialog_singleplayer.c +++ b/data/qcsrc/menu/nexuiz/dialog_singleplayer.c @@ -40,7 +40,7 @@ void InstantAction_LoadMap(entity btn, entity dummy) else if(argv(0) == "changelevel") { fclose(fh); - localcmd("\ndisconnect\nwait\ng_campaign 0\nmaxplayers $menu_maxplayers\n"); + localcmd("\nmenu_loadmap_prepare\n"); MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH); MapInfo_LoadMap(argv(1)); cvar_set("lastlevel", "1"); diff --git a/data/qcsrc/menu/nexuiz/maplist.c b/data/qcsrc/menu/nexuiz/maplist.c index 58ae942a0..0be58be08 100644 --- a/data/qcsrc/menu/nexuiz/maplist.c +++ b/data/qcsrc/menu/nexuiz/maplist.c @@ -272,7 +272,7 @@ void MapList_LoadMap(entity btn, entity me) } if(MapInfo_CheckMap(m)) { - localcmd("\ndisconnect\nwait\ng_campaign 0\nmaxplayers $menu_maxplayers\ng_maplist_shufflenow\n"); + localcmd("\nmenu_loadmap_prepare\n"); if(cvar("menu_use_default_hostname")) localcmd("hostname \"", strdecolorize(cvar_string("_cl_name")), "'s Nexuiz server\"\n"); MapInfo_LoadMap(m); -- 2.39.2