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

Merge ServerOrder into Order and 0xFE order type into 0xFF.

Browse Source
This commit is contained in:
Paul Chote
2019-05-11 15:58:17 +00:00
committed by abcdefg30
parent 90ebffc6c0
commit 862a274357
7 changed files with 73 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -13,6 +13,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Primitives;
using OpenRA.Server;
using OpenRA.Traits;
namespace OpenRA.Network
@@ -232,7 +233,12 @@ namespace OpenRA.Network
if (request.AuthToken != null && response.Fingerprint != null)
response.AuthSignature = localProfile.Sign(request.AuthToken);
orderManager.IssueOrder(Order.HandshakeResponse(response.Serialize()));
orderManager.IssueOrder(new Order("HandshakeResponse", null, false)
{
IsImmediate = true,
TargetString = response.Serialize()
});
break;
}
@@ -326,19 +332,15 @@ namespace OpenRA.Network
case "Ping":
{
orderManager.IssueOrder(Order.Pong(order.TargetString));
orderManager.IssueOrder(Order.FromTargetString("Pong", order.TargetString, true));
break;
}
default:
{
if (!order.IsImmediate)
{
var self = order.Subject;
if (!self.IsDead)
foreach (var t in self.TraitsImplementing<IResolveOrder>())
t.ResolveOrder(self, order);
}
if (order.Subject != null && !order.Subject.IsDead)
foreach (var t in order.Subject.TraitsImplementing<IResolveOrder>())
t.ResolveOrder(order.Subject, order);
break;
}