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

Merge pull request #4657 from Temeez/fixTanyaChronoBug

Browse Source 
closes #4569
This commit is contained in:
Matthias Mailänder
2014-02-15 15:09:42 +01:00
parent e4e6af6536 5b7db7ed68
commit d1d29d0fad
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -24,6 +24,7 @@ NEW:
Increased torpedo splash damage and raised multiplier vs. concrete. Increased torpedo splash damage and raised multiplier vs. concrete.
Fixed transparency glitches in the sniper icon. Fixed transparency glitches in the sniper icon.
Removed health bars and selection boxes from walls. 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: Tiberian Dawn:
Commando can now plant C4 on bridges. Commando can now plant C4 on bridges.
Added the Asset Browser to the Extras menu. Added the Asset Browser to the Extras menu.

15
OpenRA.Mods.RA/Activities/Teleport.cs
View File

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