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

removed UnitCategory. removed the last unit-based use of Categories (Categories is still used for weapons)

Browse Source
This commit is contained in:
Bob
2010-01-14 14:30:51 +13:00
parent 73f6d5c71c
commit 8aae1ff7d5
7 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ namespace OpenRa.Game.Orders
public void Tick()
{
var producing = Producer.traits.Get<Traits.ProductionQueue>().CurrentItem( Rules.UnitCategory[ Building ] );
var producing = Producer.traits.Get<Traits.ProductionQueue>().CurrentItem( Rules.NewUnitInfo[ Building ].Category );
if (producing == null || producing.Item != Building || producing.RemainingTime != 0)
Game.controller.CancelInputMode();
}

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

@@ -16,18 +16,19 @@ namespace OpenRa.Game.Orders
Game.world.AddFrameEndTask( _ =>
{
var queue = order.Player.PlayerActor.traits.Get<ProductionQueue>();
var producing = queue.CurrentItem(Rules.UnitCategory[order.TargetString]);
var unit = Rules.NewUnitInfo[ order.TargetString ];
var producing = queue.CurrentItem(unit.Category);
if( producing == null || producing.Item != order.TargetString || producing.RemainingTime != 0 )
return;
Game.world.Add( new Actor( order.TargetString, order.TargetLocation - Footprint.AdjustForBuildingSize( Rules.NewUnitInfo[ order.TargetString ].Traits.Get<BuildingInfo>() ), order.Player ) );
Game.world.Add( new Actor( order.TargetString, order.TargetLocation - Footprint.AdjustForBuildingSize( unit.Traits.Get<BuildingInfo>() ), order.Player ) );
if (order.Player == Game.LocalPlayer)
{
Sound.Play("placbldg.aud");
Sound.Play("build5.aud");
}
queue.FinishProduction(Rules.UnitCategory[order.TargetString]);
queue.FinishProduction(unit.Category);
} );
break;
}