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

fix disable-DOME bug. move call to PerfHistory.Tick so that the graph is correct in multiplayer.

Browse Source
This commit is contained in:
Bob
2010-02-11 10:47:37 +13:00
parent b630fe05d4
commit 1e652dbcc1
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/Game.cs
View File

@@ -158,13 +158,13 @@ namespace OpenRa
controller.selection.Tick(world); controller.selection.Tick(world);
world.Tick(); world.Tick();
PerfHistory.Tick();
} }
else else
if (orderManager.FrameNumber == 0) if (orderManager.FrameNumber == 0)
lastTime = Environment.TickCount; lastTime = Environment.TickCount;
} }
PerfHistory.Tick();
} }
using (new PerfSample("render")) using (new PerfSample("render"))

7
OpenRa.Game/Traits/ProvidesRadar.cs
View File

@@ -2,7 +2,10 @@
namespace OpenRa.Traits namespace OpenRa.Traits
{ {
class ProvidesRadarInfo : StatelessTraitInfo<ProvidesRadar> {} class ProvidesRadarInfo : ITraitInfo
{
public object Create( Actor self ) { return new ProvidesRadar(); }
}
class ProvidesRadar : ITick class ProvidesRadar : ITick
{ {
@@ -14,7 +17,7 @@ namespace OpenRa.Traits
{ {
// Check if powered // Check if powered
var b = self.traits.Get<Building>(); var b = self.traits.Get<Building>();
if (b != null && b.Disabled) return false; if (b.Disabled) return false;
var isJammed = self.World.Queries.WithTrait<JamsRadar>().Any(a => self.Owner != a.Actor.Owner var isJammed = self.World.Queries.WithTrait<JamsRadar>().Any(a => self.Owner != a.Actor.Owner
&& (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<JamsRadarInfo>().Range); && (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<JamsRadarInfo>().Range);