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

QueuedActivity's Insert is broken

Browse Source
This commit is contained in:
alzeih
2011-03-18 00:18:57 +13:00
committed by Paul Chote
parent 4e89326134
commit 255bac6aff
64 changed files with 218 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/Actor.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA
[Sync]
public Player Owner;
private IActivity currentActivity;
private Activity currentActivity;
public Group Group;
internal Actor(World world, string name, TypeDictionary initDict )
@@ -121,7 +121,14 @@ namespace OpenRA
public bool IsInWorld { get; internal set; }
public void QueueActivity( IActivity nextActivity )
public void QueueActivity( bool queued, Activity nextActivity )
{
if( !queued )
CancelActivity();
QueueActivity( nextActivity );
}
public void QueueActivity( Activity nextActivity )
{
if( currentActivity == null )
currentActivity = nextActivity;
@@ -135,7 +142,7 @@ namespace OpenRA
currentActivity.Cancel( this );
}
public IActivity GetCurrentActivity()
public Activity GetCurrentActivity()
{
return currentActivity;
}