r2927 - in trunk/data/qcsrc: menu-div0test server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-11-09 07:09:33 -0500 (Fri, 09 Nov 2007)
New Revision: 2927

Modified:
   trunk/data/qcsrc/menu-div0test/menu.qc
   trunk/data/qcsrc/server/cl_client.qc
Log:
fix team select dialog notification; fix clicking outside of menu items outside game


Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc	2007-11-09 10:36:19 UTC (rev 2926)
+++ trunk/data/qcsrc/menu-div0test/menu.qc	2007-11-09 12:09:33 UTC (rev 2927)
@@ -188,7 +188,13 @@
 	entity e;
 	if(itemname == "") // this can be called by GameCommand
 	{
-		m_hide();
+		if(gamestatus & (GAME_ISSERVER | GAME_CONNECTED))
+			m_hide();
+		else
+		{
+			main.initializeDialog(main, main.firstChild);
+			m_display();
+		}
 	}
 	else
 	{

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-11-09 10:36:19 UTC (rev 2926)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-11-09 12:09:33 UTC (rev 2927)
@@ -628,9 +628,14 @@
 	stuffcmd(e, "cl_movement_edgefriction 1\n");
 
 	// notify about available teams
-	CheckAllowedTeams(e);
-	t = 0; if(c1 >= 0) t |= 1; if(c2 >= 0) t |= 2; if(c3 >= 0) t |= 4; if(c4 >= 0) t |= 8;
-	stuffcmd(e, strcat("set _teams_available ", ftos(t), "\n"));
+	if(teamplay)
+	{
+		CheckAllowedTeams(e);
+		t = 0; if(c1 >= 0) t |= 1; if(c2 >= 0) t |= 2; if(c3 >= 0) t |= 4; if(c4 >= 0) t |= 8;
+		stuffcmd(e, strcat("set _teams_available ", ftos(t), "\n"));
+	}
+	else
+		stuffcmd(e, "set _teams_available 0\n");
 }
 
 /*