r2466 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-05-03 14:21:32 -0400 (Thu, 03 May 2007)
New Revision: 2466

Modified:
   trunk/data/qcsrc/server/keyhunt.qc
Log:
even more clear waiting message :)


Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2007-05-03 18:12:36 UTC (rev 2465)
+++ trunk/data/qcsrc/server/keyhunt.qc	2007-05-03 18:21:32 UTC (rev 2466)
@@ -617,10 +617,12 @@
 	kh_Controller_SetThink(cvar("g_balance_keyhunt_delay_round"), "Round starts in ", kh_StartRound);
 }
 
-float kh_EnoughPlayers()
+string kh_CheckEnoughPlayers()
 {
 	float i, players, teem;
 	entity player;
+	string result;
+	result = "";
 	
 	// find a random player per team
 	for(i = 0; i < kh_teams; ++i)
@@ -633,27 +635,35 @@
 					if(player.team == teem)
 						++players;
 		if(players == 0)
-			return FALSE;
+		{
+			if(result != "")
+				result = strcat(result, ", ");
+			result = strcat(result, ColoredTeamName(teem));
+		}
 	}
-	return TRUE;
+	return result;
 }
 
 void kh_WaitForPlayers()
 {
-	if(kh_EnoughPlayers())
+	string teams_missing;
+	teams_missing = kh_CheckEnoughPlayers();
+	if(teams_missing == "")
 		kh_Controller_SetThink(cvar("g_balance_keyhunt_delay_round"), "Round starts in ", kh_StartRound);
 	else
-		kh_Controller_SetThink(1, "Waiting for players to join...\n\nNeed at least one active player per team!", kh_WaitForPlayers);
+		kh_Controller_SetThink(1, strcat("Waiting for players to join...\n\nNeed active players for: ", teams_missing), kh_WaitForPlayers);
 }
 
 void kh_StartRound()
 {
+	string teams_missing;
 	float i, players, teem;
 	entity player;
 
-	if(!kh_EnoughPlayers())
+	teams_missing = kh_CheckEnoughPlayers();
+	if(teams_missing != "")
 	{
-		kh_Controller_SetThink(1, "Waiting for players to join...", kh_WaitForPlayers);
+		kh_Controller_SetThink(1, strcat("Waiting for players to join...\n\nNeed active players for: ", teams_missing), kh_WaitForPlayers);
 		return;
 	}