fix CS giving default units of unused unit classes in 4UC (and other …

…modmods) (#11027)
LoneGazebo · Jun 22, 2024 · a7f41c4 · a7f41c4
1 parent b488e3d
commit a7f41c4
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/CvGameCoreDLL_Expansion2/CvPlayer.cpp b/CvGameCoreDLL_Expansion2/CvPlayer.cpp
@@ -51021,7 +51021,16 @@ UnitTypes CvPlayer::GetCompetitiveSpawnUnitType(const bool bIncludeRanged, const
 
 		CvUnitClassInfo* pUnitClassInfo = GC.getUnitClassInfo(eUnitClass);
 		if (!bIncludeUUs)
-			eUnit = static_cast<UnitTypes>(pUnitClassInfo->getDefaultUnitIndex());
+		{
+			UnitTypes eReplaceUnit = static_cast<UnitTypes>(pUnitClassInfo->getDefaultUnitIndex());
+			CvUnitEntry* pUnitInfo = GC.getUnitInfo(eReplaceUnit);
+
+			// Cross check in case mods forget to change unit classes after repurposing default units
+			if (pUnitInfo->GetUnitClassType() != eUnitClass)
+				continue;
+
+			eUnit = eReplaceUnit;
+		}
 
 		CvUnitEntry* pUnitInfo = GC.getUnitInfo(eUnit);
 		if (!pUnitInfo)