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

Remove FrameData and update OrderManager

Browse Source
This commit is contained in:
teinarss
2021-05-08 16:27:30 +02:00
committed by reaperrr
parent eda79d8626
commit 96b8273916
4 changed files with 55 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Network/SyncReport.cs
View File

@@ -51,19 +51,20 @@ namespace OpenRA.Network
syncReports[i] = new Report();
}
internal void UpdateSyncReport()
internal void UpdateSyncReport(List<OrderManager.ClientOrder> orders)
{
GenerateSyncReport(syncReports[curIndex]);
GenerateSyncReport(syncReports[curIndex], orders);
curIndex = ++curIndex % NumSyncReports;
}
void GenerateSyncReport(Report report)
void GenerateSyncReport(Report report, List<OrderManager.ClientOrder> orders)
{
report.Frame = orderManager.NetFrameNumber;
report.SyncedRandom = orderManager.World.SharedRandom.Last;
report.TotalCount = orderManager.World.SharedRandom.TotalCount;
report.Traits.Clear();
report.Effects.Clear();
report.Orders = orders;
foreach (var actor in orderManager.World.ActorsHavingTrait<ISync>())
{
@@ -100,7 +101,7 @@ namespace OpenRA.Network
}
}
internal void DumpSyncReport(int frame, IEnumerable<FrameData.ClientOrder> orders)
internal void DumpSyncReport(int frame)
{
var reportName = "syncreport-" + DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ", CultureInfo.InvariantCulture) + ".log";
Log.AddChannel("sync", reportName);
@@ -137,7 +138,7 @@ namespace OpenRA.Network
}
Log.Write("sync", "Orders Issued:");
foreach (var o in orders)
foreach (var o in r.Orders)
Log.Write("sync", "\t {0}", o.ToString());
return;
@@ -154,6 +155,7 @@ namespace OpenRA.Network
public int TotalCount;
public List<TraitReport> Traits = new List<TraitReport>();
public List<EffectReport> Effects = new List<EffectReport>();
public List<OrderManager.ClientOrder> Orders = new List<OrderManager.ClientOrder>();
}
struct TraitReport