From b30e4ab4324891382b41cae9d119942b84180aa6 Mon Sep 17 00:00:00 2001
From: ScottNZ <a>
Date: Tue, 19 Jun 2012 14:43:11 +1200
Subject: [PATCH] Use SharedRandom to stop desync

---
 OpenRA.Mods.RA/Missions/Allies01Script.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.RA/Missions/Allies01Script.cs b/OpenRA.Mods.RA/Missions/Allies01Script.cs
index c9b20c1378..331a09ab56 100644
--- a/OpenRA.Mods.RA/Missions/Allies01Script.cs
+++ b/OpenRA.Mods.RA/Missions/Allies01Script.cs
@@ -51,7 +51,6 @@ namespace OpenRA.Mods.RA.Missions
         private Actor attackEntryPoint1;
         private Actor attackEntryPoint2;
 
-        private static readonly Random random = new Random();
         private static readonly string[] taunts = { "laugh1.aud", "lefty1.aud", "cmon1.aud", "gotit1.aud" };
 
         private static readonly string[] ships = { "ca", "ca", "ca", "ca" };
@@ -116,7 +115,7 @@ namespace OpenRA.Mods.RA.Missions
             // taunt every so often
             if (self.World.FrameNumber % 1000 == 0)
             {
-                Sound.Play(taunts[random.Next(0, taunts.Length)]);
+                Sound.Play(taunts[self.World.SharedRandom.Next(taunts.Length)]);
             }
             // take Tanya to the LZ
             if (self.World.FrameNumber == 1)
@@ -177,8 +176,8 @@ namespace OpenRA.Mods.RA.Missions
         {
             foreach (var unit in wave)
             {
-                var spawnActor = random.Next(2) == 0 ? attackEntryPoint1 : attackEntryPoint2;
-                var targetActor = random.Next(2) == 0 ? einstein : tanya;
+                var spawnActor = self.World.SharedRandom.Next(2) == 0 ? attackEntryPoint1 : attackEntryPoint2;
+                var targetActor = self.World.SharedRandom.Next(2) == 0 ? einstein : tanya;
                 var actor = self.World.CreateActor(unit, new TypeDictionary { new OwnerInit(soviets), new LocationInit(spawnActor.Location) });
                 actor.QueueActivity(new Attack(Target.FromActor(targetActor), 2));
             }
@@ -193,7 +192,7 @@ namespace OpenRA.Mods.RA.Missions
         private bool AlliesControlLab(Actor self)
         {
             var units = UnitsNearActor(self, lab, labRange);
-            return units.Count() >= 1 && units.All(a => a.Owner.InternalName == allies.InternalName);
+            return units.Count() >= 1 && units.All(a => a.Owner == allies);
         }
 
         private void SpawnEinsteinAtLab(Actor self)