MapRotation : add 'numConnectedPlayers' to level_locals_s

Unvanquished · Jan 5, 2020 · c2763a4 · c2763a4
1 parent 2adfc0d
commit c2763a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/sgame/sg_main.cpp b/src/sgame/sg_main.cpp
@@ -1421,6 +1421,7 @@ void CalculateRanks()
 	char P[ MAX_CLIENTS + 1 ] = "", B[ MAX_CLIENTS + 1 ] = "";
 
 	level.numConnectedClients = 0;
+	level.numConnectedPlayers = 0;
 	level.numPlayingClients   = 0;
 	level.numPlayingPlayers   = 0;
 	level.numPlayingBots      = 0;
@@ -1469,6 +1470,7 @@ void CalculateRanks()
 			else
 			{
 				level.team[ team ].numPlayers++;
+				level.numConnectedPlayers++;
 			}
 
 			if ( level.clients[ clientNum ].pers.connected != CON_CONNECTED )

diff --git a/src/sgame/sg_maprotation.cpp b/src/sgame/sg_maprotation.cpp
@@ -1199,15 +1199,7 @@ static bool G_EvaluateMapCondition( mrCondition_t **condition )
 			break;
 
 		case CV_NUMPLAYERS:
-			{
+			result = G_EvaluateIntegerCondition(localCondition, level.numConnectedPlayers);
-				int numPlayers = 0;
-				for ( int team = TEAM_NONE; team < NUM_TEAMS; team++ )
-				{
-					numPlayers += level.team[ team ].numPlayers;
-				}
-
-				result = G_EvaluateIntegerCondition(localCondition, numPlayers);
-			}
 			break;
 
 		case CV_NUMCLIENTS:

diff --git a/src/sgame/sg_struct.h b/src/sgame/sg_struct.h
@@ -624,6 +624,7 @@ struct level_locals_s
 	bool restarted; // waiting for a map_restart to fire
 
 	int      numConnectedClients; // connected
+	int      numConnectedPlayers; // connected players (not bot) in a team or spec mode
 	int      numAliveClients;     // on a team and alive
 	int      numPlayingClients;   // on a team
 	int      numPlayingPlayers;   // on a team and not a bot