Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

CrimRecya · Feb 19, 2025 · 5939c3c · 5939c3c
2 parents 5d71a34 + 7aef8ff
commit 5939c3c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Ext/Bullet/Trajectories/DisperseTrajectory.cpp b/src/Ext/Bullet/Trajectories/DisperseTrajectory.cpp
@@ -959,7 +959,7 @@ bool DisperseTrajectory::PrepareDisperseWeapon(BulletClass* pBullet)
 								{
 									const auto pObjType = pObject->GetType();
 
-									if (pObjType && !pObjType->Immune)
+									if (pObjType && !pObjType->Immune && centerCoords.DistanceFrom(pObject->GetCoords()) <= pWeapon->Range)
 										validObjects.push_back(pObject);
 								}
 
@@ -1003,6 +1003,9 @@ bool DisperseTrajectory::PrepareDisperseWeapon(BulletClass* pBullet)
 									continue;
 							}
 
+							if (centerCoords.DistanceFrom(pTechno->GetCoords()) > pWeapon->Range)
+								continue;
+
 							if (MapClass::GetTotalDamage(100, pWeapon->Warhead, pTechnoType->Armor, 0) == 0)
 								continue;
 
@@ -1046,6 +1049,9 @@ bool DisperseTrajectory::PrepareDisperseWeapon(BulletClass* pBullet)
 							continue;
 					}
 
+					if (centerCoords.DistanceFrom(pTechno->GetCoords()) > pWeapon->Range)
+						continue;
+
 					if (MapClass::GetTotalDamage(100, pWeapon->Warhead, pTechnoType->Armor, 0) == 0)
 						continue;