Extra checks against undefined behavior

LoneGazebo · Dec 7, 2024 · 6fff480 · 6fff480
1 parent 3b42d67
commit 6fff480
Show file tree

Hide file tree

Showing 5 changed files with 426 additions and 241 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvBarbarians.cpp b/CvGameCoreDLL_Expansion2/CvBarbarians.cpp
@@ -1280,7 +1280,8 @@ void CvBarbarians::SpawnBarbarianUnits(CvPlot* pPlot, int iNumUnits, BarbSpawnRe
 			if (eUnit != NO_UNIT)
 			{
 				// And spawn it!
-				CvUnit* pUnit = GET_PLAYER(BARBARIAN_PLAYER).initUnit(eUnit, pSpawnPlot->getX(), pSpawnPlot->getY(), eUnitAI);
+				CvUnitEntry* pkUnitInfo = GC.getUnitInfo(eUnit);
+				CvUnit* pUnit = GET_PLAYER(BARBARIAN_PLAYER).initUnit(eUnit, pSpawnPlot->getX(), pSpawnPlot->getY(), pkUnitInfo->GetDefaultUnitAIType());
 				if (pUnit)
 				{
 					iNumUnitsSpawned++;

diff --git a/CvGameCoreDLL_Expansion2/CvDealAI.cpp b/CvGameCoreDLL_Expansion2/CvDealAI.cpp
@@ -2856,7 +2856,7 @@ int CvDealAI::GetThirdPartyPeaceValue(bool bFromMe, PlayerTypes eOtherPlayer, Te
 
 		CivApproachTypes eAskingMajorCivApproach = pDiploAI->GetSurfaceApproach(eOtherPlayer);
 
-		// Modify for our feelings towards the asking player
+		// Modify for our feelings towards the player we'd be asking
 		switch (eAskingMajorCivApproach)
 		{
 		case CIV_APPROACH_WAR: