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

merge Game.Init into PreInit; fix exploit involving chrome.CheckDeadTab; fixed cancel behaviour wrt canceling an item not currently in the queue (because of orderlag, etc)

Browse Source
This commit is contained in:
Bob
2010-04-16 14:18:30 +12:00
parent db46502123
commit 55352d7df9
4 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Traits/Player/ProductionQueue.cs
View File

@@ -44,8 +44,15 @@ namespace OpenRA.Traits
public void Tick( Actor self )
{
foreach( var p in production )
{
while( p.Value.Count > 0 && !Rules.TechTree.BuildableItems( self.Owner, p.Key ).Contains( p.Value[ 0 ].Item ) )
{
self.Owner.GiveCash(p.Value[0].TotalCost - p.Value[0].RemainingCost); // refund what's been paid so far.
FinishProduction(p.Key);
}
if( p.Value.Count > 0 )
(p.Value)[0].Tick( self.Owner );
( p.Value )[ 0 ].Tick( self.Owner );
}
}
public void ResolveOrder( Actor self, Order order )
@@ -127,7 +134,7 @@ namespace OpenRA.Traits
{
queue.RemoveAt(lastIndex);
}
else
else if( lastIndex == 0 )
{
var item = queue[0];
self.Owner.GiveCash(item.TotalCost - item.RemainingCost); // refund what's been paid so far.