From 8a3bf7d805068cde9535747aa4f2db61f62b444e Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 5 Dec 2009 22:26:28 +1300 Subject: [PATCH] showing the real story wrt power --- OpenRa.Game/Chrome.cs | 5 +++-- OpenRa.Game/Player.cs | 9 ++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs index 9db44777e9..4813ac94db 100644 --- a/OpenRa.Game/Chrome.cs +++ b/OpenRa.Game/Chrome.cs @@ -85,12 +85,13 @@ namespace OpenRa.Game buildItems.Clear(); renderer.Device.DisableScissor(); - renderer.DrawText("RenderFrame {0} ({2:F1} ms)\nTick {1} ({3:F1} ms)\nPower {4}\nReady: {5} (F8 to toggle)".F( + renderer.DrawText("RenderFrame {0} ({2:F1} ms)\nTick {1} ({3:F1} ms)\nPower {4}/{5}\nReady: {6} (F8 to toggle)".F( Game.RenderFrame, Game.orderManager.FrameNumber, PerfHistory.items["render"].LastValue, PerfHistory.items["tick_time"].LastValue, - Game.LocalPlayer.GetTotalPower(), + Game.LocalPlayer.powerDrained, + Game.LocalPlayer.powerProvided, Game.LocalPlayer.IsReady ? "Yes" : "No" ), new int2(140, 5), Color.White); diff --git a/OpenRa.Game/Player.cs b/OpenRa.Game/Player.cs index dc0273c9d9..7d371a2a8b 100644 --- a/OpenRa.Game/Player.cs +++ b/OpenRa.Game/Player.cs @@ -15,8 +15,8 @@ namespace OpenRa.Game public int Cash; public int Ore; public int DisplayCash; - int powerProvided; - int powerDrained; + public int powerProvided; + public int powerDrained; public bool IsReady; @@ -43,11 +43,6 @@ namespace OpenRa.Game powerDrained -= dPower; } - public int GetTotalPower() - { - return powerProvided - powerDrained; - } - public float GetSiloFullness() { return (float)Ore / GetOreCapacity();