diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index 8bd5730a10..925c5b12fd 100755 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -47,8 +47,7 @@ namespace OpenRA public Shroud.ActorVisibility Sight; - [Sync] - public Player Owner; + [Sync] public Player Owner; Activity currentActivity; public Group Group; diff --git a/OpenRA.Game/Traits/CreatesShroud.cs b/OpenRA.Game/Traits/CreatesShroud.cs index 9b1a22aa7b..cda91774ce 100644 --- a/OpenRA.Game/Traits/CreatesShroud.cs +++ b/OpenRA.Game/Traits/CreatesShroud.cs @@ -18,10 +18,10 @@ namespace OpenRA.Traits public object Create(ActorInitializer init) { return new CreatesShroud(this); } } - public class CreatesShroud : ITick + public class CreatesShroud : ITick, ISync { CreatesShroudInfo Info; - CPos previousLocation; + [Sync] CPos previousLocation; Shroud.ActorVisibility v; public CreatesShroud(CreatesShroudInfo info) @@ -37,20 +37,20 @@ namespace OpenRA.Traits if (previousLocation != self.Location && v != null) { previousLocation = self.Location; - var shrouds = self.World.ActorsWithTrait().Select(s => s.Actor.Owner.Shroud); + var shrouds = self.World.ActorsWithTrait().Select(s => s.Actor.Owner.Shroud); foreach (var shroud in shrouds) { shroud.UnhideActor(self, v, Info.Range); } } if (!self.TraitsImplementing().Any(d => d.Disabled)) { - var shrouds = self.World.ActorsWithTrait().Select(s => s.Actor.Owner.Shroud); + var shrouds = self.World.ActorsWithTrait().Select(s => s.Actor.Owner.Shroud); foreach (var shroud in shrouds) { shroud.HideActor(self, Info.Range); } } else { - var shrouds = self.World.ActorsWithTrait().Select(s => s.Actor.Owner.Shroud); + var shrouds = self.World.ActorsWithTrait().Select(s => s.Actor.Owner.Shroud); foreach (var shroud in shrouds) { shroud.UnhideActor(self, v, Info.Range); } diff --git a/OpenRA.Game/Traits/Player/PlayerResources.cs b/OpenRA.Game/Traits/Player/PlayerResources.cs index 9f0261e4d9..032be55465 100644 --- a/OpenRA.Game/Traits/Player/PlayerResources.cs +++ b/OpenRA.Game/Traits/Player/PlayerResources.cs @@ -75,13 +75,10 @@ namespace OpenRA.Traits AdviceInterval = info.AdviceInterval; } - [Sync] - public int Cash; + [Sync] public int Cash; - [Sync] - public int Ore; - [Sync] - public int OreCapacity; + [Sync] public int Ore; + [Sync] public int OreCapacity; public int DisplayCash; public int DisplayOre; diff --git a/OpenRA.Game/Traits/RevealsShroud.cs b/OpenRA.Game/Traits/RevealsShroud.cs index 17a9de7fe9..e20c5e53f8 100644 --- a/OpenRA.Game/Traits/RevealsShroud.cs +++ b/OpenRA.Game/Traits/RevealsShroud.cs @@ -16,10 +16,10 @@ namespace OpenRA.Traits public object Create(ActorInitializer init) { return new RevealsShroud(this); } } - public class RevealsShroud : ITick + public class RevealsShroud : ITick, ISync { RevealsShroudInfo Info; - CPos previousLocation; + [Sync] CPos previousLocation; public RevealsShroud(RevealsShroudInfo info) { diff --git a/OpenRA.Game/Traits/World/Shroud.cs b/OpenRA.Game/Traits/World/Shroud.cs index 6392caef4c..4e94321c01 100644 --- a/OpenRA.Game/Traits/World/Shroud.cs +++ b/OpenRA.Game/Traits/World/Shroud.cs @@ -20,19 +20,19 @@ namespace OpenRA.Traits public object Create(ActorInitializer init) { return new Shroud(init.world); } } - public class Shroud + public class Shroud : ISync { Map map; World world; - public Player Owner; + [Sync] public Player Owner; public int[,] visibleCells; public bool[,] exploredCells; public bool[,] foggedCells; public Rectangle? exploredBounds; bool disabled = false; public bool dirty = true; - public bool Disabled + [Sync] public bool Disabled { get { return disabled; } set { disabled = value; Dirty(); } @@ -70,7 +70,7 @@ namespace OpenRA.Traits // cache of positions that were added, so no matter what crazy trait code does, it // can't make us invalid. - public class ActorVisibility { public int range; public CPos[] vis; } + public class ActorVisibility { [Sync] public int range; [Sync] public CPos[] vis; } public Dictionary vis = new Dictionary(); static IEnumerable FindVisibleTiles(World world, CPos a, int r) diff --git a/OpenRA.Mods.RA/Air/Aircraft.cs b/OpenRA.Mods.RA/Air/Aircraft.cs index 10aa762605..b1e3eda26a 100755 --- a/OpenRA.Mods.RA/Air/Aircraft.cs +++ b/OpenRA.Mods.RA/Air/Aircraft.cs @@ -102,12 +102,9 @@ namespace OpenRA.Mods.RA.Air protected readonly Actor self; - [Sync] - public int Facing { get; set; } - [Sync] - public int Altitude { get; set; } - [Sync] - public PSubPos SubPxPosition; + [Sync] public int Facing { get; set; } + [Sync] public int Altitude { get; set; } + [Sync] public PSubPos SubPxPosition; public PPos PxPosition { get { return SubPxPosition.ToPPos(); } } public CPos TopLeft { get { return PxPosition.ToCPos(); } }