minor optimization & fix on AE transfer and 570733f

- fix AffectTargets/AffectTypes/IgnoreTypes not working properly in transfer
- cumulative AE will try to refresh the one with lowest duration during a transfer
- more early bail out
- remove some duplicated checks

Author: Coronia

src/Ext/Building/Body.cpp

@@ -287,7 +287,7 @@ void BuildingExt::ExtData::ApplyPoweredKillSpawns()
 	auto const pThis = this->OwnerObject();
 	auto const pTypeExt = this->TypeExtData;
 
-	if (pTypeExt->Powered_KillSpawns && pThis->Type->Powered && !pThis->IsPowerOnline())
+	if (pTypeExt->Powered_KillSpawns && !pThis->IsPowerOnline())
 	{
 		if (auto const pManager = pThis->SpawnManager)
 		{

src/Ext/Techno/Body.cpp

@@ -618,29 +618,27 @@ UnitTypeClass* TechnoExt::GetUnitTypeExtra(UnitClass* pUnit, TechnoTypeExt::ExtD
 
 AircraftTypeClass* TechnoExt::GetAircraftTypeExtra(AircraftClass* pAircraft)
 {
-	if (pAircraft->IsGreenHP())
+	auto const pType = pAircraft->Type;
+	auto const pData = TechnoTypeExt::ExtMap.Find(pType);
+
+	if (!pData->NeedDamagedImage || pAircraft->IsGreenHP())
 	{
-		return pAircraft->Type;
+		return pType;
 	}
 	else if (pAircraft->IsYellowHP())
 	{
-		auto const pData = TechnoTypeExt::ExtMap.Find(pAircraft->Type);
-
 		if (auto const imageYellow = pData->Image_ConditionYellow)
 			return abstract_cast<AircraftTypeClass*, true>(imageYellow);
 	}
 	else
 	{
-		auto const pType = pAircraft->Type;
-		auto const pData = TechnoTypeExt::ExtMap.Find(pType);
-
 		if (auto const imageRed = pData->Image_ConditionRed)
 			return abstract_cast<AircraftTypeClass*, true>(imageRed);
 		else if (auto const imageYellow = pData->Image_ConditionYellow)
 			return abstract_cast<AircraftTypeClass*, true>(imageYellow);
 	}
 
-	return pAircraft->Type;
+	return pType;
 
 }
 

src/New/Entity/AttachEffectClass.cpp

@@ -671,9 +671,10 @@ int AttachEffectClass::Attach(TechnoClass* pTarget, HouseClass* pInvokerHouse, T
 /// <param name="pInvoker">Techno that invoked the attachment.</param>
 /// <param name="pSource">Source object for the attachment e.g a Warhead or Techno.</param>
 /// <param name="attachParams">Attachment parameters.</param>
+/// <param name="checkCumulative">Whether cumulative AE needs to be processed.</param>
 /// <returns>The created and attached AttachEffect if successful, nullptr if not.</returns>
 AttachEffectClass* AttachEffectClass::CreateAndAttach(AttachEffectTypeClass* pType, TechnoClass* pTarget, TechnoTypeClass* pTargetType, std::vector<std::unique_ptr<AttachEffectClass>>& targetAEs,
-	HouseClass* pInvokerHouse, TechnoClass* pInvoker, AbstractClass* pSource, AEAttachParams const& attachParams)
+	HouseClass* pInvokerHouse, TechnoClass* pInvoker, AbstractClass* pSource, AEAttachParams const& attachParams, bool checkCumulative)
 {
 	if (!pType)
 		return nullptr;
@@ -693,6 +694,7 @@ AttachEffectClass* AttachEffectClass::CreateAndAttach(AttachEffectTypeClass* pTy
 		return nullptr;
 
 	int currentTypeCount = 0;
+	const bool cumulative = pType->Cumulative && checkCumulative;
 	AttachEffectClass* match = nullptr;
 	std::vector<AttachEffectClass*> cumulativeMatches;
 	cumulativeMatches.reserve(targetAEs.size());
@@ -704,12 +706,19 @@ AttachEffectClass* AttachEffectClass::CreateAndAttach(AttachEffectTypeClass* pTy
 		if (attachEffect->GetType() == pType)
 		{
 			currentTypeCount++;
-			match = attachEffect;
 
-			if (!pType->Cumulative)
+			if (!cumulative)
+			{
+				match = attachEffect;
 				break;
+			}
 			else if (!attachParams.CumulativeRefreshSameSourceOnly || (attachEffect->Source == pSource && attachEffect->Invoker == pInvoker))
+			{
 				cumulativeMatches.push_back(attachEffect);
+
+				if (!match || attachEffect->Duration < match->Duration)
+					match = attachEffect;
+			}
 		}
 	}
 
@@ -726,15 +735,7 @@ AttachEffectClass* AttachEffectClass::CreateAndAttach(AttachEffectTypeClass* pTy
 			}
 			else
 			{
-				AttachEffectClass* best = nullptr;
-
-				for (auto const& ae : cumulativeMatches)
-				{
-					if (!best || ae->Duration < best->Duration)
-						best = ae;
-				}
-
-				best->RefreshDuration(attachParams.DurationOverride);
+				match->RefreshDuration(attachParams.DurationOverride);
 			}
 
 			AttachEffectTypeClass::HandleEvent(pTarget);
@@ -749,7 +750,7 @@ AttachEffectClass* AttachEffectClass::CreateAndAttach(AttachEffectTypeClass* pTy
 		}
 	}
 
-	if (!pType->Cumulative && currentTypeCount > 0 && match)
+	if (!cumulative && match)
 	{
 		match->RefreshDuration(attachParams.DurationOverride);
 		AttachEffectTypeClass::HandleEvent(pTarget);
@@ -759,7 +760,7 @@ AttachEffectClass* AttachEffectClass::CreateAndAttach(AttachEffectTypeClass* pTy
 		targetAEs.emplace_back(std::make_unique<AttachEffectClass>(pType, pTarget, pInvokerHouse, pInvoker, pSource, attachParams.DurationOverride, attachParams.Delay, attachParams.InitialDelay, attachParams.RecreationDelay));
 		auto const pAE = targetAEs.back().get();
 
-		if (!currentTypeCount && pType->Cumulative && pType->CumulativeAnimations.size() > 0)
+		if (!currentTypeCount && cumulative && pType->CumulativeAnimations.size() > 0)
 			pAE->HasCumulativeAnim = true;
 
 		return pAE;
@@ -966,42 +967,46 @@ void AttachEffectClass::TransferAttachedEffects(TechnoClass* pSource, TechnoClas
 
 		if (!isValid)
 		{
-			++it;
+			it = pSourceExt->AttachedEffects.erase(it);
 			continue;
 		}
 
 		int currentTypeCount = 0;
+		const bool cumulative = type->Cumulative;
 		AttachEffectClass* match = nullptr;
-		AttachEffectClass* sourceMatch = nullptr;
 
 		for (auto const& aePtr : pTargetExt->AttachedEffects)
 		{
 			auto const targetAttachEffect = aePtr.get();
 
 			if (targetAttachEffect->GetType() == type)
 			{
-				currentTypeCount++;
-				match = targetAttachEffect;
+				currentTypeCount++;	
 
-				if (targetAttachEffect->Source == attachEffect->Source && targetAttachEffect->Invoker == attachEffect->Invoker)
-					sourceMatch = targetAttachEffect;
+				if (!cumulative)
+				{
+					match = targetAttachEffect;
+					break;
+				}
+				else if (targetAttachEffect->Source == attachEffect->Source && targetAttachEffect->Invoker == attachEffect->Invoker)
+				{
+					if (!match || targetAttachEffect->Duration < match->Duration)
+						match = targetAttachEffect;
+				}
 			}
 		}
 
-		if (type->Cumulative && type->Cumulative_MaxCount >= 0 && currentTypeCount >= type->Cumulative_MaxCount && sourceMatch)
-		{
-			sourceMatch->Duration = Math::max(sourceMatch->Duration, attachEffect->Duration);
-		}
-		else if (!type->Cumulative && currentTypeCount > 0 && match)
+		if (match)
 		{
-			match->Duration = Math::max(match->Duration, attachEffect->Duration);
+			if (!cumulative || (type->Cumulative_MaxCount >= 0 && currentTypeCount >= type->Cumulative_MaxCount))
+				match->Duration = Math::max(match->Duration, attachEffect->Duration);
 		}
 		else
 		{
 			AEAttachParams info {};
 			info.DurationOverride = attachEffect->DurationOverride;
 
-			if (auto const pAE = AttachEffectClass::CreateAndAttach(type, pTarget, pTargetType, pTargetExt->AttachedEffects, attachEffect->InvokerHouse, attachEffect->Invoker, attachEffect->Source, info))
+			if (auto const pAE = AttachEffectClass::CreateAndAttach(type, pTarget, pTargetType, pTargetExt->AttachedEffects, attachEffect->InvokerHouse, attachEffect->Invoker, attachEffect->Source, info, false))
 				pAE->Duration = attachEffect->Duration;
 		}
 

src/New/Entity/AttachEffectClass.h

@@ -65,7 +65,7 @@ class AttachEffectClass
 	void AnimCheck();
 
 	static AttachEffectClass* CreateAndAttach(AttachEffectTypeClass* pType, TechnoClass* pTarget, TechnoTypeClass* pTargetType, std::vector<std::unique_ptr<AttachEffectClass>>& targetAEs, HouseClass* pInvokerHouse, TechnoClass* pInvoker,
-		AbstractClass* pSource, AEAttachParams const& attachInfo);
+		AbstractClass* pSource, AEAttachParams const& attachInfo, bool checkCumulative = true);
 
 	static int DetachTypes(TechnoClass* pTarget, AEAttachInfoTypeClass const& attachEffectInfo, std::vector<AttachEffectTypeClass*> const& types);
 	static int RemoveAllOfType(AttachEffectTypeClass* pType, TechnoClass* pTarget, int minCount, int maxCount);