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

Fix and polish all ra production structures; remove some obsoleted Production subclasses

Browse Source
This commit is contained in:
Paul Chote
2010-08-03 18:29:32 +12:00
parent 8e82f6fa1a
commit 40b16e33ba
11 changed files with 62 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Traits/Production.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Traits
public class Production : IIssueOrder, IResolveOrder, ITags, IOrderCursor
{
public readonly Dictionary<float2, int2> Spawns = new Dictionary<float2, int2>();
public readonly List<Pair<float2, int2>> Spawns = new List<Pair<float2, int2>>();
public Production(ProductionInfo info)
{
if (info.SpawnOffsets == null || info.ExitCells == null)
@@ -38,7 +38,7 @@ namespace OpenRA.Traits
throw new System.InvalidOperationException("SpawnOffset, ExitCells length mismatch");
for (int i = 0; i < info.ExitCells.Length; i+=2)
Spawns.Add(new float2(info.SpawnOffsets[i],info.SpawnOffsets[i+1]), new int2(info.ExitCells[i], info.ExitCells[i+1]));
Spawns.Add(Pair.New(new float2(info.SpawnOffsets[i],info.SpawnOffsets[i+1]), new int2(info.ExitCells[i], info.ExitCells[i+1])));
}
public void DoProduction(Actor self, Actor newUnit, int2 exit, float2 spawn)
@@ -100,8 +100,8 @@ namespace OpenRA.Traits
// Todo: Reorder in a synced random way
foreach (var s in Spawns)
{
var exit = self.Location + s.Value;
var spawn = self.CenterLocation + s.Key;
var exit = self.Location + s.Second;
var spawn = self.CenterLocation + s.First;
if (mobile.CanEnterCell(exit,self,true))
{
DoProduction(self, newUnit, exit, spawn);