[nexuiz-commits] r6733 - in trunk/data: . qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-14 08:34:24 -0400 (Thu, 14 May 2009)
New Revision: 6733

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
   trunk/data/qcsrc/menu/nexuiz/maplist.c
Log:
make maxplayers at least bot_number+1


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-05-14 09:22:35 UTC (rev 6732)
+++ trunk/data/defaultNexuiz.cfg	2009-05-14 12:34:24 UTC (rev 6733)
@@ -1258,6 +1258,10 @@
 
 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

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c	2009-05-14 09:22:35 UTC (rev 6732)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c	2009-05-14 12:34:24 UTC (rev 6733)
@@ -40,7 +40,7 @@
 		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");

Modified: trunk/data/qcsrc/menu/nexuiz/maplist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/maplist.c	2009-05-14 09:22:35 UTC (rev 6732)
+++ trunk/data/qcsrc/menu/nexuiz/maplist.c	2009-05-14 12:34:24 UTC (rev 6733)
@@ -272,7 +272,7 @@
 	}
 	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);