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

Remove World.FrameNumber.

Browse Source
This commit is contained in:
Paul Chote
2014-03-12 17:19:29 +13:00
parent a7d6f717c4
commit 20b88fd904
13 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -291,7 +291,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
statusCheckbox.IsHighlighted = () => !statusCheckbox.IsChecked() &&
orderManager.LobbyInfo.FirstEmptySlot() == null &&
world.FrameNumber / 25 % 2 == 0;
orderManager.LocalFrameNumber / 25 % 2 == 0;
}
// Options panel

4
OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs
View File

@@ -285,12 +285,12 @@ namespace OpenRA.Mods.RA.Widgets.Logic
string AverageOrdersPerMinute(double orders)
{
return (world.FrameNumber == 0 ? 0 : orders / (world.FrameNumber / 1500.0)).ToString("F1");
return (world.WorldTick == 0 ? 0 : orders / (world.WorldTick / 1500.0)).ToString("F1");
}
string AverageEarnedPerMinute(double earned)
{
return "$" + (world.FrameNumber == 0 ? 0 : earned / (world.FrameNumber / 1500.0)).ToString("F2");
return "$" + (world.WorldTick == 0 ? 0 : earned / (world.WorldTick / 1500.0)).ToString("F2");
}
static Color GetPowerColor(PowerState state)