Merge pull request #11513 from GraionDilach/idamage

Remove passing the warheads from DamageWarhead to AttackInfo.
2016-07-16 14:26:43 +02:00
parent a7d82c6dba cf8fff2b99
commit 5b61206ac6
30 changed files with 69 additions and 64 deletions
--- a/OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs
+++ b/OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs
@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Cnc.Traits
 			}
 		}

-		public int GetDamageModifier(Actor attacker, IWarhead warhead)
+		public int GetDamageModifier(Actor attacker, Damage damage)
 		{
 			return state == PopupState.Closed ? info.ClosedDamageMultiplier : 100;
 		}