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

add the total number of values extracted from RNG to sync report

Browse Source
This commit is contained in:
Matthias Mailänder
2013-02-25 20:52:48 +01:00
parent 4b2f08f21f
commit dd476bbf5c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.FileFormats/Thirdparty/Random.cs vendored
View File

@@ -20,6 +20,7 @@ namespace OpenRA.Thirdparty
int index = 0; int index = 0;
public int Last; public int Last;
public int TotalCount = 0;
public Random() : this(Environment.TickCount) { } public Random() : this(Environment.TickCount) { }
@@ -41,6 +42,7 @@ namespace OpenRA.Thirdparty
y ^= y >> 18; y ^= y >> 18;
index = (index + 1) % 624; index = (index + 1) % 624;
TotalCount++;
Last = (int)(y % int.MaxValue); Last = (int)(y % int.MaxValue);
return Last; return Last;
} }

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

@@ -36,6 +36,7 @@ namespace OpenRA.Network
{ {
report.Frame = orderManager.NetFrameNumber; report.Frame = orderManager.NetFrameNumber;
report.SyncedRandom = orderManager.world.SharedRandom.Last; report.SyncedRandom = orderManager.world.SharedRandom.Last;
report.TotalCount = orderManager.world.SharedRandom.TotalCount;
report.Traits.Clear(); report.Traits.Clear();
foreach (var a in orderManager.world.ActorsWithTrait<ISync>()) foreach (var a in orderManager.world.ActorsWithTrait<ISync>())
{ {
@@ -58,7 +59,7 @@ namespace OpenRA.Network
if (r.Frame == frame) if (r.Frame == frame)
{ {
Log.Write("sync", "Sync for net frame {0} -------------", r.Frame); Log.Write("sync", "Sync for net frame {0} -------------", r.Frame);
Log.Write("sync", "SharedRandom: "+r.SyncedRandom); Log.Write("sync", "SharedRandom: {0} (#{1})", r.SyncedRandom, r.TotalCount);
Log.Write("sync", "Synced Traits:"); Log.Write("sync", "Synced Traits:");
foreach (var a in r.Traits) foreach (var a in r.Traits)
Log.Write("sync", "\t {0} {1} {2} {3} ({4})".F( Log.Write("sync", "\t {0} {1} {2} {3} ({4})".F(
@@ -77,6 +78,7 @@ namespace OpenRA.Network
{ {
public int Frame; public int Frame;
public int SyncedRandom; public int SyncedRandom;
public int TotalCount;
public List<TraitReport> Traits = new List<TraitReport>(); public List<TraitReport> Traits = new List<TraitReport>();
} }