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

Rules.NewUnitInfo rename -> ActorInfo

Browse Source
This commit is contained in:
Chris Forbes
2010-01-17 11:07:08 +13:00
parent 33ba3a58c5
commit d1ecfacd55
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -8,7 +8,7 @@ namespace OpenRa.Orders
{
readonly Actor Producer;
readonly string Building;
BuildingInfo BuildingInfo { get { return Rules.NewUnitInfo[ Building ].Traits.Get<BuildingInfo>(); } }
BuildingInfo BuildingInfo { get { return Rules.ActorInfo[ Building ].Traits.Get<BuildingInfo>(); } }
public PlaceBuildingOrderGenerator(Actor producer, string name)
{
@@ -41,7 +41,7 @@ namespace OpenRa.Orders
public void Tick()
{
var producing = Producer.traits.Get<Traits.ProductionQueue>().CurrentItem( Rules.NewUnitInfo[ Building ].Category );
var producing = Producer.traits.Get<Traits.ProductionQueue>().CurrentItem( Rules.ActorInfo[ Building ].Category );
if (producing == null || producing.Item != Building || producing.RemainingTime != 0)
Game.controller.CancelInputMode();
}

2
OpenRa.Game/Orders/UnitOrderGenerator.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRa.Orders
else
return Cursor.MoveBlocked;
case "DeployMcv":
var factBuildingInfo = Rules.NewUnitInfo["fact"].Traits.Get<BuildingInfo>();
var factBuildingInfo = Rules.ActorInfo["fact"].Traits.Get<BuildingInfo>();
if (Game.CanPlaceBuilding("fact", factBuildingInfo, a.Location - new int2(1, 1), a, false))
return Cursor.Deploy;
else

2
OpenRa.Game/Orders/UnitOrders.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRa.Orders
Game.world.AddFrameEndTask( _ =>
{
var queue = order.Player.PlayerActor.traits.Get<ProductionQueue>();
var unit = Rules.NewUnitInfo[ order.TargetString ];
var unit = Rules.ActorInfo[ order.TargetString ];
var producing = queue.CurrentItem(unit.Category);
if( producing == null || producing.Item != order.TargetString || producing.RemainingTime != 0 )
return;