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

get rid of Sellable.Selling state

Browse Source
This commit is contained in:
Chris Forbes
2012-09-13 07:09:44 +12:00
parent c253e59c57
commit b0b0fac847
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Activities/CaptureActor.cs
View File

@@ -36,10 +36,6 @@ namespace OpenRA.Mods.RA.Activities
if (capturable != null && capturable.CaptureInProgress && capturable.Captor.Owner.Stances[self.Owner] == Stance.Ally) if (capturable != null && capturable.CaptureInProgress && capturable.Captor.Owner.Stances[self.Owner] == Stance.Ally)
return NextActivity; return NextActivity;
var sellable = target.TraitOrDefault<Sellable>();
if (sellable != null && sellable.Selling)
return NextActivity;
if (!target.Trait<Capturable>().BeginCapture(target, self)) if (!target.Trait<Capturable>().BeginCapture(target, self))
return NextActivity; return NextActivity;

6
OpenRA.Mods.RA/Sellable.cs
View File

@@ -22,11 +22,9 @@ namespace OpenRA.Mods.RA
public class Sellable : IResolveOrder public class Sellable : IResolveOrder
{ {
[Sync] public bool Selling = false;
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "Sell" && !Selling) if (order.OrderString == "Sell")
{ {
var capturing = self.TraitOrDefault<Capturable>(); var capturing = self.TraitOrDefault<Capturable>();
if (capturing != null && capturing.CaptureInProgress) if (capturing != null && capturing.CaptureInProgress)
@@ -35,8 +33,6 @@ namespace OpenRA.Mods.RA
if (!self.Trait<Building>().Lock()) if (!self.Trait<Building>().Lock())
return; return;
Selling = true;
foreach( var ns in self.TraitsImplementing<INotifySold>() ) foreach( var ns in self.TraitsImplementing<INotifySold>() )
ns.Selling( self ); ns.Selling( self );