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

Don't reserve airfields/helipads for husks that just fall down

Browse Source 
fixes #3376
This commit is contained in:
Matthias Mailänder
2013-06-16 11:24:03 +02:00
parent 886099a948
commit 11755798cc
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Actor.cs
View File

@@ -128,9 +128,9 @@ namespace OpenRA
Bounds.Invalidate();
ExtendedBounds.Invalidate();
currentActivity = Traits.Util.RunActivity( this, currentActivity );
currentActivity = Traits.Util.RunActivity(this, currentActivity);
}
public void UpdateSight()
{
Sight.vis = Shroud.GetVisOrigins(this).ToArray();

10
OpenRA.Game/Game.cs
View File

@@ -122,17 +122,17 @@ namespace OpenRA
public static void RunAfterTick(Action a) { delayedActions.Add(a); }
public static void RunAfterDelay(int delay, Action a) { delayedActions.Add(a, delay); }
static void Tick( OrderManager orderManager, Viewport viewPort )
static void Tick(OrderManager orderManager, Viewport viewPort)
{
if (orderManager.Connection.ConnectionState != lastConnectionState)
{
lastConnectionState = orderManager.Connection.ConnectionState;
ConnectionStateChanged( orderManager );
ConnectionStateChanged(orderManager);
}
Tick( orderManager );
if( worldRenderer != null && orderManager.world != worldRenderer.world )
Tick( worldRenderer.world.orderManager );
Tick(orderManager);
if (worldRenderer != null && orderManager.world != worldRenderer.world)
Tick(worldRenderer.world.orderManager);
using (new PerfSample("render"))
{

2
OpenRA.Game/Traits/Health.cs
View File

@@ -144,7 +144,7 @@ namespace OpenRA.Traits
.Concat(self.Owner.PlayerActor.TraitsImplementing<INotifyKilled>()))
nd.Killed(self, ai);
if( RemoveOnDeath )
if (RemoveOnDeath)
self.Destroy();
Log.Write("debug", "{0} #{1} killed by {2} #{3}", self.Info.Name, self.ActorID, attacker.Info.Name, attacker.ActorID);

10
OpenRA.Game/Traits/Util.cs
View File

@@ -110,19 +110,19 @@ namespace OpenRA.Traits
(next, a) => { a.Queue( next ); return a; });
}
public static Activity RunActivity( Actor self, Activity act )
public static Activity RunActivity(Actor self, Activity act)
{
while( act != null )
while (act != null)
{
var prev = act;
var sw = new Stopwatch();
act = act.Tick( self );
act = act.Tick(self);
var dt = sw.ElapsedTime();
if(dt > Game.Settings.Debug.LongTickThreshold)
if (dt > Game.Settings.Debug.LongTickThreshold)
Log.Write("perf", "[{2}] Activity: {0} ({1:0.000} ms)", prev, dt * 1000, Game.LocalTick);
if( prev == act )
if (prev == act)
break;
}
return act;