From 1e652dbcc159877c1c2be95b98c032b05c4ed5fd Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 11 Feb 2010 10:47:37 +1300 Subject: [PATCH] fix disable-DOME bug. move call to PerfHistory.Tick so that the graph is correct in multiplayer. --- OpenRa.Game/Game.cs | 4 ++-- OpenRa.Game/Traits/ProvidesRadar.cs | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs index dbc8949625..9dca57e81e 100644 --- a/OpenRa.Game/Game.cs +++ b/OpenRa.Game/Game.cs @@ -158,13 +158,13 @@ namespace OpenRa controller.selection.Tick(world); world.Tick(); + + PerfHistory.Tick(); } else if (orderManager.FrameNumber == 0) lastTime = Environment.TickCount; } - - PerfHistory.Tick(); } using (new PerfSample("render")) diff --git a/OpenRa.Game/Traits/ProvidesRadar.cs b/OpenRa.Game/Traits/ProvidesRadar.cs index 03bc6abcfc..764839777e 100644 --- a/OpenRa.Game/Traits/ProvidesRadar.cs +++ b/OpenRa.Game/Traits/ProvidesRadar.cs @@ -2,7 +2,10 @@ namespace OpenRa.Traits { - class ProvidesRadarInfo : StatelessTraitInfo {} + class ProvidesRadarInfo : ITraitInfo + { + public object Create( Actor self ) { return new ProvidesRadar(); } + } class ProvidesRadar : ITick { @@ -14,7 +17,7 @@ namespace OpenRa.Traits { // Check if powered var b = self.traits.Get(); - if (b != null && b.Disabled) return false; + if (b.Disabled) return false; var isJammed = self.World.Queries.WithTrait().Any(a => self.Owner != a.Actor.Owner && (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get().Range);