Count units inside transporters for mission end results

Warzone2100 · Nov 1, 2023 · f19cf46 · f19cf46
1 parent 2ec127a
commit f19cf46
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 15 deletions.
diff --git a/src/droid.cpp b/src/droid.cpp
@@ -2286,29 +2286,38 @@ const char *getDroidLevelName(const DROID *psDroid)
 
 UDWORD	getNumDroidsForLevel(uint32_t player, UDWORD level)
 {
-	DROID	*psDroid;
-	UDWORD	count = 0;
+	unsigned int idx = 0;
+	unsigned int count = 0;
 
 	if (player >= MAX_PLAYERS) { return 0; }
 
-	for (psDroid = apsDroidLists[player]; psDroid; psDroid = psDroid->psNext)
+	do
 	{
-		if (getDroidLevel(psDroid) == level)
+		DROID *psDroid = nullptr;
+		switch (idx)
 		{
-			count++;
+			case 0: psDroid = apsDroidLists[selectedPlayer]; break;
+			case 1: if (prevMissionType == LEVEL_TYPE::LDS_MKEEP_LIMBO) { psDroid = apsLimboDroids[selectedPlayer]; } break;
+			default: psDroid = nullptr;
 		}
-	}
-
-	if (prevMissionType == LEVEL_TYPE::LDS_MKEEP_LIMBO)
-	{
-		for (psDroid = apsLimboDroids[player]; psDroid; psDroid = psDroid->psNext)
+		for (; psDroid; psDroid = psDroid->psNext)
 		{
 			if (getDroidLevel(psDroid) == level)
 			{
-				count++;
+				++count;
+			}
+			if (isTransporter(psDroid))
+			{
+				for (DROID *psCurr = psDroid->psGroup->psList; psCurr != nullptr; psCurr = psCurr->psGrpNext)
+				{
+					if (psCurr != psDroid && getDroidLevel(psCurr) == level)
+					{
+						++count;
+					}
+				}
 			}
 		}
-	}
+	} while (++idx < 2);
 
 	return count;
 }

diff --git a/src/scores.cpp b/src/scores.cpp
@@ -293,9 +293,31 @@ END_GAME_STATS_DATA	collectEndGameStatsData()
 	fullStats.numUnits = 0;
 	if (selectedPlayer < MAX_PLAYERS)
 	{
-		for (DROID *psDroid = apsDroidLists[selectedPlayer]; psDroid; psDroid = psDroid->psNext, fullStats.numUnits++) {}
-		for (DROID *psDroid = mission.apsDroidLists[selectedPlayer]; psDroid; psDroid = psDroid->psNext, fullStats.numUnits++) {}
-		if (prevMissionType == LEVEL_TYPE::LDS_MKEEP_LIMBO) { for (DROID *psDroid = apsLimboDroids[selectedPlayer]; psDroid; psDroid = psDroid->psNext, fullStats.numUnits++) {} }
+		unsigned int idx = 0;
+		do
+		{
+			DROID *psDroid = nullptr;
+			switch (idx)
+			{
+				case 0: psDroid = apsDroidLists[selectedPlayer]; break;
+				case 1: psDroid = mission.apsDroidLists[selectedPlayer]; break;
+				case 2: if (prevMissionType == LEVEL_TYPE::LDS_MKEEP_LIMBO) { psDroid = apsLimboDroids[selectedPlayer]; } break;
+				default: psDroid = nullptr;
+			}
+			for (; psDroid; psDroid = psDroid->psNext, ++fullStats.numUnits)
+			{
+				if (isTransporter(psDroid))
+				{
+					for (DROID *psCurr = psDroid->psGroup->psList; psCurr != nullptr; psCurr = psCurr->psGrpNext)
+					{
+						if (psCurr != psDroid)
+						{
+							++fullStats.numUnits;
+						}
+					}
+				}
+			}
+		} while (++idx < 3);
 	}
 
 	return fullStats;