[Minor] Fix ExtraWarheads always read the last setting (#1503)

`ExtraWarheads.DetonationChances` and `ExtraWarheads.FullDetonation`.
Phobos-developers · Jan 21, 2025 · 750afeb · 750afeb
1 parent 5a9a0ef
commit 750afeb
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/src/Ext/Bullet/Hooks.DetonateLogics.cpp b/src/Ext/Bullet/Hooks.DetonateLogics.cpp
@@ -320,29 +320,24 @@ DEFINE_HOOK(0x469AA4, BulletClass_Logics_Extras, 0x5)
 
 			if (size > i)
 				detonate = pWeaponExt->ExtraWarheads_DetonationChances[i] >= ScenarioClass::Instance->Random.RandomDouble();
-			if (size > 0)
+			else if (size > 0)
 				detonate = pWeaponExt->ExtraWarheads_DetonationChances[size - 1] >= ScenarioClass::Instance->Random.RandomDouble();
 
 			bool isFull = true;
 			size = pWeaponExt->ExtraWarheads_FullDetonation.size();
 
 			if (size > i)
 				isFull = pWeaponExt->ExtraWarheads_FullDetonation[i];
-			if (size > 0)
+			else if (size > 0)
 				isFull = pWeaponExt->ExtraWarheads_FullDetonation[size - 1];
 
-			if (detonate)
-			{
-				if (isFull)
-				{
-					WarheadTypeExt::DetonateAt(pWH, *coords, pThis->Owner, damage, pOwner, pThis->Target);
-				}
-				else
-				{
-					auto const pWHExt = WarheadTypeExt::ExtMap.Find(pWH);
-					pWHExt->DamageAreaWithTarget(*coords, damage, pThis->Owner, pWH, true, pOwner, abstract_cast<TechnoClass*>(pThis->Target));
-				}
-			}
+			if (!detonate)
+				continue;
+
+			if (isFull)
+				WarheadTypeExt::DetonateAt(pWH, *coords, pThis->Owner, damage, pOwner, pThis->Target);
+			else
+				WarheadTypeExt::ExtMap.Find(pWH)->DamageAreaWithTarget(*coords, damage, pThis->Owner, pWH, true, pOwner, abstract_cast<TechnoClass*>(pThis->Target));
 		}
 	}