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

Introduced NUnit and some tests.

Browse Source
This commit is contained in:
huwpascoe
2014-10-19 19:54:38 +01:00
parent 19c1f4ca99
commit dfc6ebd3ba
10 changed files with 11334 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Network/Order.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA
public bool IsImmediate;
public bool SuppressVisualFeedback;
public Player Player { get { return Subject.Owner; } }
public Player Player { get { return Subject != null ? Subject.Owner : null; } }
Order(string orderString, Actor subject,
Actor targetActor, CPos targetLocation, string targetString, bool queued, CPos extraLocation, uint extraData)
@@ -79,6 +79,9 @@ namespace OpenRA
var extraLocation = (CPos)(flags.HasField(OrderFields.ExtraLocation) ? r.ReadInt2() : int2.Zero);
var extraData = flags.HasField(OrderFields.ExtraData) ? r.ReadUInt32() : 0;
if (world == null)
return new Order(order, null, null, targetLocation, targetString, queued, extraLocation, extraData);
Actor subject, targetActor;
if (!TryGetActorFromUInt(world, subjectId, out subject) || !TryGetActorFromUInt(world, targetActorId, out targetActor))
return null;

2
OpenRA.Game/Platform.cs
View File

@@ -122,7 +122,7 @@ namespace OpenRA
path = "^" + path.Substring(SupportDir.Length);
if (path.StartsWith(GameDir))
path = "." + path.Substring(GameDir.Length);
path = "./" + path.Substring(GameDir.Length);
return path;
}