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

Remove some duplication

Browse Source
This commit is contained in:
Paul Chote
2010-08-26 21:43:14 +12:00
parent 267d89a459
commit ee546750b2
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Game/Network/Order.cs
View File

@@ -191,20 +191,5 @@ namespace OpenRA
{ {
return new Order("CancelProduction", subject, item); return new Order("CancelProduction", subject, item);
} }
public static Order StartProduction(Player subject, string item, int count)
{
return new Order("StartProduction", subject.PlayerActor, new int2( count, 0 ), item );
}
public static Order PauseProduction(Player subject, string item, bool pause)
{
return new Order("PauseProduction", subject.PlayerActor, new int2( pause ? 1 : 0, 0 ), item);
}
public static Order CancelProduction(Player subject, string item)
{
return new Order("CancelProduction", subject.PlayerActor, item);
}
} }
} }

8
OpenRA.Mods.RA/HackyAI.cs
View File

@@ -290,7 +290,7 @@ namespace OpenRA.Mods.RA
var unit = ChooseRandomUnitToBuild(category); var unit = ChooseRandomUnitToBuild(category);
if (unit != null) if (unit != null)
{ {
Game.IssueOrder(Order.StartProduction(p, unit, 1)); Game.IssueOrder(Order.StartProduction(queue.self, unit, 1));
} }
} }
@@ -316,7 +316,7 @@ namespace OpenRA.Mods.RA
else else
{ {
state = BuildState.WaitForProduction; state = BuildState.WaitForProduction;
Game.IssueOrder(Order.StartProduction(p, item, 1)); Game.IssueOrder(Order.StartProduction(queue.self, item, 1));
} }
} }
break; break;
@@ -325,7 +325,7 @@ namespace OpenRA.Mods.RA
if (currentBuilding == null) return; /* let it happen.. */ if (currentBuilding == null) return; /* let it happen.. */
else if (currentBuilding.Paused) else if (currentBuilding.Paused)
Game.IssueOrder(Order.PauseProduction(p, currentBuilding.Item, false)); Game.IssueOrder(Order.PauseProduction(queue.self, currentBuilding.Item, false));
else if (currentBuilding.Done) else if (currentBuilding.Done)
{ {
state = BuildState.WaitForFeedback; state = BuildState.WaitForFeedback;
@@ -336,7 +336,7 @@ namespace OpenRA.Mods.RA
if (location == null) if (location == null)
{ {
Game.Debug("AI: Nowhere to place {0}".F(currentBuilding.Item)); Game.Debug("AI: Nowhere to place {0}".F(currentBuilding.Item));
Game.IssueOrder(Order.CancelProduction(p, currentBuilding.Item)); Game.IssueOrder(Order.CancelProduction(queue.self, currentBuilding.Item));
} }
else else
{ {