Fix PowersUpToLevel=-1 upgrade animations

Author: Starkku

docs/Whats-New.md

@@ -12,7 +12,7 @@ You can use the migration utility (can be found on [Phobos supplementaries repo]
 
 - `Vertical=true` projectiles no longer move horizontally if fired by aircraft by default. To re-enable this behaviour set `Vertical.AircraftFix=false` on the projectile.
 - Weapons with `Airstrike=true` on Warhead will now check target eligibility for airstrikes regardless of weapon slot. Use `AirstrikeTargets=all` on `Primary` airstrike weapon Warhead to restore previous behaviour.
-- `PowersUpNAnim` is now used instead of the upgrade building's image file for upgrade animation if set. Note that displaying a damaged version will still require setting `PowerUpXDamagedAnim` explicitly in all cases, as the fallback to upgrade building image does not extend to it, nor would it be safe to add.
+- `PowersUpNAnim` is now used instead of the upgrade building's image file for upgrade animation if set. Note that displaying a damaged version will still require setting `PowerUpXDamagedAnim` explicitly in all cases, as the fallback to upgrade building image does not extend to it, nor would it be safe to add. `PowersUpToLevel=-1` upgrades still do not work correctly `PowersUpNAnim` and such buildings should forgo using explicit upgrade animations.
 - `[CrateRules] -> FreeMCV` now controls whether or not player is forced to receive unit from `[General] -> BaseUnit` from goodie crate if they own no buildings or any existing `[General] -> BaseUnit` vehicles and own more than `[CrateRules] -> FreeMCV.CreditsThreshold` (defaults to 1500) credits.
 - Translucent RLE SHPs will now be drawn using a more precise and performant algorithm that has no green tint and banding. Can be disabled with `rulesmd.ini -> [General] -> FixTransparencyBlitters=no`.
 - Iron Curtain status is now preserved by default when converting between TechnoTypes via `DeploysInto` / `UndeploysInto`. This behavior can be turned off per-TechnoType and global basis using `[TechnoType]/[CombatDamage] -> IronCurtain.KeptOnDeploy=no`.

src/Ext/BuildingType/Body.cpp

@@ -336,6 +336,7 @@ void BuildingTypeExt::ExtData::Serialize(T& Stm)
 		.Process(this->BunkerWallsDownSound)
 		.Process(this->BuildingRepairedSound)
 		.Process(this->Refinery_UseNormalActiveAnim)
+		.Process(this->HasPowerUpAnim)
 		;
 }
 

src/Ext/BuildingType/Body.h

@@ -97,6 +97,8 @@ class BuildingTypeExt
 
 		Valueable<bool> Refinery_UseNormalActiveAnim;
 
+		ValueableVector<bool> HasPowerUpAnim;
+
 		ExtData(BuildingTypeClass* OwnerObject) : Extension<BuildingTypeClass>(OwnerObject)
 			, PowersUp_Owner { AffectedHouse::Owner }
 			, PowersUp_Buildings {}
@@ -158,6 +160,7 @@ class BuildingTypeExt
 			, BunkerWallsDownSound {}
 			, BuildingRepairedSound {}
 			, Refinery_UseNormalActiveAnim { false }
+			, HasPowerUpAnim {}
 		{ }
 
 		// Ares 0.A functions

src/Ext/BuildingType/Hooks.Upgrade.cpp

@@ -142,18 +142,23 @@ DEFINE_HOOK(0x464749, BuildingTypeClass_ReadINI_PowerUpAnims, 0x6)
 
 	GET(BuildingTypeClass*, pThis, EBP);
 
+	auto const pTypeExt = BuildingTypeExt::ExtMap.Find(pThis);
 	auto const pINI = &CCINIClass::INI_Art;
 
 	int index = 1;
 	char buffer[0x20];
 
+	pTypeExt->HasPowerUpAnim.clear();
+
 	while (index - 1 < 3)
 	{
 		auto const animData = &pThis->BuildingAnim[index - 1];
 
 		sprintf_s(buffer, "PowerUp%01dAnim", index);
 		pINI->GetString(pThis->ImageFile, buffer, animData->Anim);
 
+		pTypeExt->HasPowerUpAnim.emplace_back(GeneralUtils::IsValidString(animData->Anim));
+
 		sprintf_s(buffer, "PowerUp%01dDamagedAnim", index);
 		pINI->GetString(pThis->ImageFile, buffer, animData->Damaged);
 
@@ -206,8 +211,8 @@ DEFINE_HOOK(0x440988, BuildingClass_Unlimbo_UpgradeAnims, 0x7)
 
 	auto const animData = &pTarget->Type->BuildingAnim[animIndex];
 
-	// Only copy image name to BuildingType anim struct if it is not already set.
-	if (!GeneralUtils::IsValidString(animData->Anim))
+	// Only copy image name to BuildingType anim struct if theres no explicit PowersUpAnim for this level.
+	if (!pTargetExt->TypeExtData->HasPowerUpAnim[animIndex])
 		strncpy(animData->Anim, pThis->Type->ImageFile, 16u);
 
 	return SkipGameCode;