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

Properly remove worms from the world

Browse Source
This commit is contained in:
penev92
2015-03-05 22:22:08 +02:00
parent 58ab28206f
commit 4a5b3b59ed
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Player/EnemyWatcher.cs
View File

@@ -75,6 +75,9 @@ namespace OpenRA.Mods.Common.Traits
|| self.Owner.Stances[actor.Actor.Owner] != Stance.Enemy) || self.Owner.Stances[actor.Actor.Owner] != Stance.Enemy)
continue; continue;
if (actor.Actor.IsDead || !actor.Actor.IsInWorld)
continue;
// The actor is not currently visible // The actor is not currently visible
if (!self.Owner.Shroud.IsVisible(actor.Actor)) if (!self.Owner.Shroud.IsVisible(actor.Actor))
continue; continue;

6
OpenRA.Mods.D2k/Activities/SwallowActor.cs
View File

@@ -115,11 +115,7 @@ namespace OpenRA.Mods.D2k.Activities
if (self.World.SharedRandom.Next() % 100 <= sandworm.Info.ChanceToDisappear) if (self.World.SharedRandom.Next() % 100 <= sandworm.Info.ChanceToDisappear)
{ {
self.CancelActivity(); self.CancelActivity();
self.World.AddFrameEndTask(w => w.Remove(self)); self.World.AddFrameEndTask(w => self.Kill(self));
var wormManager = self.World.WorldActor.TraitOrDefault<WormManager>();
if (wormManager != null)
wormManager.DecreaseWormCount();
} }
else else
renderUnit.DefaultAnimation.ReplaceAnim("idle"); renderUnit.DefaultAnimation.ReplaceAnim("idle");