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

Merge pull request #11161 from pchote/fix-td-replay-timer

Browse Source 
Fix replay timer.
This commit is contained in:
Oliver Brakmann
2016-04-21 21:17:22 +02:00
parent 4858ae7132 a8350783fc
commit c8a9936b6c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs
View File

@@ -40,12 +40,22 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (timer != null) if (timer != null)
{ {
// Timers in replays should be synced to the effective game time, not the playback time.
var timestep = world.Timestep;
if (world.IsReplay)
{
GameSpeed speed;
var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>();
if (gameSpeeds.Speeds.TryGetValue(world.LobbyInfo.GlobalSettings.GameSpeedType, out speed))
timestep = speed.Timestep;
}
timer.GetText = () => timer.GetText = () =>
{ {
if (status == null && shouldShowStatus()) if (status == null && shouldShowStatus())
return statusText(); return statusText();
return WidgetUtils.FormatTime(world.WorldTick, world.Timestep); return WidgetUtils.FormatTime(world.WorldTick, timestep);
}; };
} }