fix warnings

Author: Hello71

CvGameCoreDLL_Expansion2/CvCity.cpp

@@ -31763,7 +31763,7 @@ void CvCity::doUnitCompletionYields(CvUnit* pUnit, UnitCreationReason eReason)
 		if (iYieldQuantityOnCompletion > 0)
 		{
 			// Look up instant yield type based on unit creation reason
-			InstantYieldType eIYieldType = INSTANT_YIELD_TYPE_INSTANT;
+			InstantYieldType eIYieldType;
 			switch (eReason) {
 			case REASON_TRAIN:
 				eIYieldType = INSTANT_YIELD_TYPE_U_PROD;
@@ -31774,6 +31774,8 @@ void CvCity::doUnitCompletionYields(CvUnit* pUnit, UnitCreationReason eReason)
 			case REASON_FAITH_BUY:
 				eIYieldType = INSTANT_YIELD_TYPE_FAITH_PURCHASE;
 				break;
+			default:
+				eIYieldType = INSTANT_YIELD_TYPE_INSTANT;
 			}
 
 			GET_PLAYER(getOwner()).doInstantYield(eIYieldType, false, NO_GREATPERSON, NO_BUILDING, iYieldQuantityOnCompletion, 

CvGameCoreDLL_Expansion2/CvUnit.cpp

@@ -23963,7 +23963,8 @@ void CvUnit::DoConvertEnemyUnitToBarbarian(const CvPlot* pPlot)
 							}
 						}
 					}
-				}/*
+				}
+#if 0
 				// Is this unit running into a unit that might convert it into a barbarian??
 				if(IsCombatUnit() && !isBarbarian() && !pPlot->isFriendlyCity(*this))
 				{
@@ -23983,7 +23984,7 @@ void CvUnit::DoConvertEnemyUnitToBarbarian(const CvPlot* pPlot)
 									{
 
 										CvPlayer* pBarbPlayer = &GET_PLAYER(BARBARIAN_PLAYER);
-										pConvertUnit = pBarbPlayer->initUnit(getUnitType(), getX(), getY(), AI_getUnitAIType(), NO_DIRECTION, true /*bNoMove, false);
+										pConvertUnit = pBarbPlayer->initUnit(getUnitType(), getX(), getY(), AI_getUnitAIType(), NO_DIRECTION, true /*bNoMove*/, false);
 										pConvertUnit->convert(this, false);
 										pConvertUnit->setupGraphical();
 										pConvertUnit->setDamage(iExistingDamage, BARBARIAN_PLAYER);
@@ -24001,7 +24002,7 @@ void CvUnit::DoConvertEnemyUnitToBarbarian(const CvPlot* pPlot)
 							}
 						}
 					}
-				}*/
+#endif
 			}
 		}
 	}