epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11513 from GraionDilach/idamage

Browse Source 
Remove passing the warheads from DamageWarhead to AttackInfo.
This commit is contained in:
Matthias Mailänder
2016-07-16 14:26:43 +02:00
committed by GitHub
parent a7d82c6dba cf8fff2b99
commit 5b61206ac6
30 changed files with 69 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Activities/CaptureActor.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Activities
else
{
var damage = health.MaxHP * capturesInfo.SabotageHPRemoval / 100;
actor.InflictDamage(self, damage, null);
actor.InflictDamage(self, new Damage(damage));
}
self.Dispose();

2
OpenRA.Mods.Common/Activities/Repair.cs
View File

@@ -71,7 +71,7 @@ namespace OpenRA.Mods.Common.Activities
return this;
}
self.InflictDamage(self, -hpToRepair, null);
self.InflictDamage(self, new Damage(-hpToRepair));
foreach (var depot in host.TraitsImplementing<INotifyRepair>())
depot.Repairing(host, self);

2
OpenRA.Mods.Common/Activities/RepairBuilding.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Activities
if (health.DamageState == DamageState.Undamaged)
return;
target.InflictDamage(self, -health.MaxHP, null);
target.InflictDamage(self, new Damage(-health.MaxHP));
}
}
}