From def564e97c165a745bfe3b02e0d64623020f7bf5 Mon Sep 17 00:00:00 2001 From: atlimit8 Date: Wed, 4 Nov 2015 18:57:03 -0600 Subject: [PATCH] reorganize CreateEffectWarhead.GetImpactType(World world, CPos cell, WPos pos) --- .../Warheads/CreateEffectWarhead.cs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs index aed6e0510d..6b5b82f6f0 100644 --- a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs @@ -43,19 +43,15 @@ namespace OpenRA.Mods.Common.Warheads var airMargin = new WDist(128); var dat = world.Map.DistanceAboveTerrain(pos); - var isAir = dat.Length > airMargin.Length; - var isWater = dat.Length <= 0 && world.Map.GetTerrainInfo(cell).IsWater; var isDirectHit = GetDirectHit(world, cell, pos); - if (isAir && !isDirectHit) - return ImpactType.Air; - else if (isWater && !isDirectHit) - return ImpactType.Water; - else if (isAir && isDirectHit) - return ImpactType.AirHit; - else if (isWater && isDirectHit) - return ImpactType.WaterHit; - else if (isDirectHit) + if (dat.Length > airMargin.Length) + return isDirectHit ? ImpactType.AirHit : ImpactType.Air; + + if (dat.Length <= 0 && world.Map.GetTerrainInfo(cell).IsWater) + return isDirectHit ? ImpactType.WaterHit : ImpactType.Water; + + if (isDirectHit) return ImpactType.GroundHit; return ImpactType.Ground;