From 2d4ed56f765da2617e75a64d6ada8a9205c5c035 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 25 Aug 2010 20:35:22 +1200 Subject: [PATCH] make it work, but there's some issues --- OpenRA.Mods.Cnc/Missions/Gdi01Script.cs | 4 ++-- OpenRA.Mods.RA/CreateMapPlayers.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs index d973e4bd5d..cbd2f6af85 100644 --- a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs +++ b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs @@ -52,8 +52,8 @@ namespace OpenRA.Mods.RA public void WorldLoaded(World w) { - Map = w.Map; - Players = w.WorldActor.Trait().Players; + Map = w.Map; + Players = w.players.Values.ToDictionary(p => p.InternalName); Actors = w.WorldActor.Trait().Actors; Game.MoveViewport((.5f * (w.Map.TopLeft + w.Map.BottomRight).ToFloat2()).ToInt2()); diff --git a/OpenRA.Mods.RA/CreateMapPlayers.cs b/OpenRA.Mods.RA/CreateMapPlayers.cs index c0dea18a9c..ada279b796 100644 --- a/OpenRA.Mods.RA/CreateMapPlayers.cs +++ b/OpenRA.Mods.RA/CreateMapPlayers.cs @@ -37,11 +37,11 @@ namespace OpenRA.Mods.RA foreach(var p in Players) { - foreach(var q in w.Map.Players[p.Key].Allies) - p.Value.Stances[Players[q]] = Stance.Ally; + // foreach(var q in w.Map.Players[p.Key].Allies) + // p.Value.Stances[Players[q]] = Stance.Ally; - foreach(var q in w.Map.Players[p.Key].Enemies) - p.Value.Stances[Players[q]] = Stance.Enemy; + // foreach(var q in w.Map.Players[p.Key].Enemies) + // p.Value.Stances[Players[q]] = Stance.Enemy; } } }