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

Merge pull request #2729 from Mailaender/sync

Browse Source 
Dump some more values into the debug log to investigate desyncs
This commit is contained in:
Chris Forbes
2013-03-09 21:10:42 -08:00
parent 25971bf98f a02fddd1a0
commit e45fc0079c
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Network/OrderManager.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -140,17 +140,17 @@ namespace OpenRA.Network
if (index >= orders.Count()) if (index >= orders.Count())
OutOfSync(frame); OutOfSync(frame);
throw new InvalidOperationException("Out of sync in frame {0}.\n {1}".F(frame, orders.ElementAt(index).Order.ToString())); throw new InvalidOperationException("Out of sync in frame {0}.\n {1}\n Compare syncreport.log with other players.".F(frame, orders.ElementAt(index).Order.ToString()));
} }
void OutOfSync(int frame) void OutOfSync(int frame)
{ {
throw new InvalidOperationException("Out of sync in frame {0}.\n".F(frame)); throw new InvalidOperationException("Out of sync in frame {0}.\n Compare syncreport.log with other players.".F(frame));
} }
void OutOfSync(int frame, string blame) void OutOfSync(int frame, string blame)
{ {
throw new InvalidOperationException("Out of sync in frame {0}: Blame {1}.\n".F(frame, blame)); throw new InvalidOperationException("Out of sync in frame {0}: Blame {1}.\n Compare syncreport.log with other players.".F(frame, blame));
} }
public bool IsReadyForNextFrame public bool IsReadyForNextFrame

1
OpenRA.Mods.RA/AutoTarget.cs
View File

@@ -109,6 +109,7 @@ namespace OpenRA.Mods.RA
var info = self.Info.Traits.Get<AttackBaseInfo>(); var info = self.Info.Traits.Get<AttackBaseInfo>();
nextScanTime = (int)(25 * (info.ScanTimeAverage + nextScanTime = (int)(25 * (info.ScanTimeAverage +
(self.World.SharedRandom.NextFloat() * 2 - 1) * info.ScanTimeSpread)); (self.World.SharedRandom.NextFloat() * 2 - 1) * info.ScanTimeSpread));
Log.Write("debug", "Actor {0}; nextScanTime: {1}", self.ActorID, nextScanTime);
var inRange = self.World.FindUnitsInCircle(self.CenterLocation, (int)(Game.CellSize * range)); var inRange = self.World.FindUnitsInCircle(self.CenterLocation, (int)(Game.CellSize * range));

3
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -57,8 +57,9 @@ namespace OpenRA.Mods.RA.Effects
if (info.Inaccuracy > 0) if (info.Inaccuracy > 0)
{ {
var factor = ((Args.dest - Args.src).Length / Game.CellSize) / (float)args.weapon.Range; var factor = ((Args.dest - Args.src).ToCVec().Length) / args.weapon.Range;
Args.dest += (PVecInt) (info.Inaccuracy * factor * args.firedBy.World.SharedRandom.Gauss2D(2)).ToInt2(); Args.dest += (PVecInt) (info.Inaccuracy * factor * args.firedBy.World.SharedRandom.Gauss2D(2)).ToInt2();
Log.Write("debug", "Bullet with Inaccuracy; factor: #{0}; Projectile dest: {1}", factor, Args.dest);
} }
if (Info.Image != null) if (Info.Image != null)