Applied feedback

regarding the WH re-declaration warning and the double to int

Author: FS-21

src/Ext/RadSite/Body.cpp

@@ -18,7 +18,7 @@ bool RadSiteExt::ExtData::ApplyRadiationDamage(TechnoClass* pTarget, int& damage
 
 	// Check if the WH should affect the techno target or skip it
 	double versus = MapClass::GetTotalDamage(damage, pWarhead, pTarget->GetTechnoType()->Armor, 0);
-	int nDamageTotal = damage * versus;
+	int nDamageTotal = static_cast<int>(damage * versus);
 
 	if (pTarget->Health > 0 && !pWHExt->CanKill && nDamageTotal >= pTarget->Health)
 	{
@@ -36,14 +36,9 @@ bool RadSiteExt::ExtData::ApplyRadiationDamage(TechnoClass* pTarget, int& damage
 	else
 	{
 		if (this->Type->GetWarheadDetonateFull())
-		{
 			WarheadTypeExt::DetonateAt(pWarhead, pTarget, this->RadInvoker, damage, this->RadHouse);
-		}
 		else
-		{
-			auto const pWHExt = WarheadTypeExt::ExtMap.Find(pWarhead);
 			pWHExt->DamageAreaWithTarget(pTarget->GetCoords(), damage, this->RadInvoker, pWarhead, true, this->RadHouse, pTarget);
-		}
 
 		if (!pTarget->IsAlive)
 			return false;

src/Ext/Techno/Hooks.ReceiveDamage.cpp

@@ -21,7 +21,7 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 
 	int nDamageLeft = *args->Damage;
 	double versus = MapClass::GetTotalDamage(nDamageLeft, args->WH, pThis->GetTechnoType()->Armor, 0);
-	int nDamageTotal = nDamageLeft * versus;
+	int nDamageTotal = static_cast<int>(nDamageLeft * versus);
 	auto const pWHExt = WarheadTypeExt::ExtMap.Find(args->WH);
 
 	if (!args->IgnoreDefenses)
@@ -59,7 +59,7 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 	}
 
 	// Update remaining damage and check if the target will die and should be avoided
-	nDamageTotal = nDamageLeft * versus;
+	nDamageTotal = static_cast<int>(nDamageLeft * versus);
 
 	if (pThis->Health > 0 && !pWHExt->CanKill && nDamageTotal >= pThis->Health)
 	{