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

more refs to Game.world (Orders, etc)

Browse Source
This commit is contained in:
Bob
2010-01-21 13:47:06 +13:00
parent f01990cae1
commit 232ed72bbf
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRa.Game/Orders/Order.cs
View File

@@ -64,14 +64,14 @@ namespace OpenRa
}
}
static Player LookupPlayer(uint index)
static Player LookupPlayer(World world, uint index)
{
return Game.world.players
.Where(x => x.Value.Index == index)
.First().Value;
}
public static Order Deserialize(BinaryReader r)
public static Order Deserialize(World world, BinaryReader r)
{
switch (r.ReadByte())
{
@@ -87,7 +87,7 @@ namespace OpenRa
targetString = r.ReadString();
Actor subject, targetActor;
if( !TryGetActorFromUInt( subjectId, out subject ) || !TryGetActorFromUInt( targetActorId, out targetActor ) )
if( !TryGetActorFromUInt( world, subjectId, out subject ) || !TryGetActorFromUInt( world, targetActorId, out targetActor ) )
return null;
return new Order( order, subject, targetActor, targetLocation, targetString);
@@ -99,7 +99,7 @@ namespace OpenRa
var name = r.ReadString();
var data = r.ReadString();
return new Order( name, LookupPlayer( playerID ).PlayerActor, null, int2.Zero, data ) { IsImmediate = true };
return new Order( name, LookupPlayer( world, playerID ).PlayerActor, null, int2.Zero, data ) { IsImmediate = true };
}
default:
@@ -113,7 +113,7 @@ namespace OpenRa
return a.ActorID;
}
static bool TryGetActorFromUInt(uint aID, out Actor ret )
static bool TryGetActorFromUInt(World world, uint aID, out Actor ret )
{
if( aID == 0xFFFFFFFF )
{
@@ -122,7 +122,7 @@ namespace OpenRa
}
else
{
foreach( var a in Game.world.Actors.Where( x => x.ActorID == aID ) )
foreach( var a in world.Actors.Where( x => x.ActorID == aID ) )
{
ret = a;
return true;