Merge pull request #4657 from Temeez/fixTanyaChronoBug

closes #4569
This commit is contained in:
Matthias Mailänder
2014-02-15 15:09:42 +01:00
2 changed files with 9 additions and 7 deletions

View File

@@ -24,6 +24,7 @@ NEW:
Increased torpedo splash damage and raised multiplier vs. concrete.
Fixed transparency glitches in the sniper icon.
Removed health bars and selection boxes from walls.
Fixed build-limited units such as Tanya being unavailable after using the Chronosphere on a vehicle she is in.
Tiberian Dawn:
Commando can now plant C4 on bridges.
Added the Asset Browser to the Extras menu.

View File

@@ -39,14 +39,15 @@ namespace OpenRA.Mods.RA.Activities
if (killCargo && self.HasTrait<Cargo>())
{
var cargo = self.Trait<Cargo>();
while (!cargo.IsEmpty(self))
if (chronosphere != null)
{
if (chronosphere != null && chronosphere.HasTrait<UpdatesPlayerStatistics>())
chronosphere.Owner.PlayerActor.Trait<PlayerStatistics>().UnitsKilled++;
var a = cargo.Unload(self);
if (a.HasTrait<UpdatesPlayerStatistics>())
a.Owner.PlayerActor.Trait<PlayerStatistics>().UnitsDead++;
while (!cargo.IsEmpty(self))
{
var a = cargo.Unload(self);
// Kill all the units that are unloaded into the void
// Kill() handles kill and death statistics
a.Kill(chronosphere);
}
}
}