r2389 - in branches/nexuiz-2.0/data: . qcsrc/menu/base qcsrc/menu/custom

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-04-25 04:54:41 -0400 (Wed, 25 Apr 2007)
New Revision: 2389

Modified:
   branches/nexuiz-2.0/data/default.cfg
   branches/nexuiz-2.0/data/qcsrc/menu/base/hostcache.qc
   branches/nexuiz-2.0/data/qcsrc/menu/base/hostcache.qh
   branches/nexuiz-2.0/data/qcsrc/menu/custom/joingame.qc
   branches/nexuiz-2.0/data/qcsrc/menu/custom/joingame.qm
Log:
numbots;
incomplete comment in default.cfg


Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg	2007-04-25 08:53:33 UTC (rev 2388)
+++ branches/nexuiz-2.0/data/default.cfg	2007-04-25 08:54:41 UTC (rev 2389)
@@ -123,7 +123,7 @@
 net_connecttimeout 30
 sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
 cl_movement 1
-cl_movement_minping 0
+cl_movement_minping 0 // currently works better than making it ping dependent
 seta cl_autoswitch 1
 cl_netinputpacketlosstolerance 0
 cl_stairsmoothspeed 200
@@ -612,7 +612,8 @@
 
 set nextmap "" // override the maplist when switching to the next map
 set lastlevel ""
-set quit_when_empty 0 // set to 1, then the server exits when the next level starts
+set quit_when_empty 0 // set to 1, then the server exits when the next level would start but is empty
+set quit_and_redirect "" // set to an IP to redirect all players at the end of the match to another server. Set to "self" to let all players reconnect at the end of the match (use it to make seamless engine updates)
 
 // singleplayer campaign
 set g_campaign 0

Modified: branches/nexuiz-2.0/data/qcsrc/menu/base/hostcache.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/base/hostcache.qc	2007-04-25 08:53:33 UTC (rev 2388)
+++ branches/nexuiz-2.0/data/qcsrc/menu/base/hostcache.qc	2007-04-25 08:54:41 UTC (rev 2389)
@@ -12,6 +12,7 @@
 	SLIST_FIELD_MAXPLAYERS = gethostcacheindexforkey( "maxplayers" );
 	SLIST_FIELD_NUMPLAYERS = gethostcacheindexforkey( "numplayers" );
 	SLIST_FIELD_NUMHUMANS = gethostcacheindexforkey( "numhumans" );
+	SLIST_FIELD_NUMBOTS = gethostcacheindexforkey( "numbots" );
 	SLIST_FIELD_PROTOCOL = gethostcacheindexforkey( "protocol" );
 };
 

Modified: branches/nexuiz-2.0/data/qcsrc/menu/base/hostcache.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/base/hostcache.qh	2007-04-25 08:53:33 UTC (rev 2388)
+++ branches/nexuiz-2.0/data/qcsrc/menu/base/hostcache.qh	2007-04-25 08:54:41 UTC (rev 2389)
@@ -10,6 +10,7 @@
 float SLIST_FIELD_MAXPLAYERS;
 float SLIST_FIELD_NUMPLAYERS;
 float SLIST_FIELD_NUMHUMANS;
+float SLIST_FIELD_NUMBOTS;
 float SLIST_FIELD_PROTOCOL;
 
 float HostCache_ViewCount;

Modified: branches/nexuiz-2.0/data/qcsrc/menu/custom/joingame.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/custom/joingame.qc	2007-04-25 08:53:33 UTC (rev 2388)
+++ branches/nexuiz-2.0/data/qcsrc/menu/custom/joingame.qc	2007-04-25 08:54:41 UTC (rev 2389)
@@ -94,12 +94,13 @@
 void() Item_Nex_HostCache_Players_Update =
 {
 	local string lHum, lNum, lMax;
-	local float lHumans;
+	local float lHumans, lBots;
 
 	if( HostCache_ViewCount <= self._parent.stepValue )
 		return;
 	lHumans = gethostcachenumber( SLIST_FIELD_NUMHUMANS, self._parent.stepValue );
-	if (lHumans >= 0) lHum = ftos( lHumans ); else lHum = "?";
+	lBots = gethostcachenumber( SLIST_FIELD_NUMBOTS, self._parent.stepValue );
+	if (lBots >= 0) lHum = ftos( lHumans ); else lHum = "?";
 	lNum = ftos( gethostcachenumber( SLIST_FIELD_NUMPLAYERS, self._parent.stepValue ) );
 	lMax = ftos( gethostcachenumber( SLIST_FIELD_MAXPLAYERS, self._parent.stepValue ) );
 

Modified: branches/nexuiz-2.0/data/qcsrc/menu/custom/joingame.qm
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/custom/joingame.qm	2007-04-25 08:53:33 UTC (rev 2388)
+++ branches/nexuiz-2.0/data/qcsrc/menu/custom/joingame.qm	2007-04-25 08:54:41 UTC (rev 2389)
@@ -170,6 +170,10 @@
 						lField = SLIST_FIELD_NUMPLAYERS;
 						lIsStringArg = false;
 					}
+					else if( lToken == "numbots" ) {
+						lField = SLIST_FIELD_NUMBOTS;
+						lIsStringArg = false;
+					}
 					else if( lToken == "numhumans" ) {
 						lField = SLIST_FIELD_NUMHUMANS;
 						lIsStringArg = false;