showing the real story wrt power

This commit is contained in:
Chris Forbes
2009-12-05 22:26:28 +13:00
parent 2de5ec4b3a
commit 8a3bf7d805
2 changed files with 5 additions and 9 deletions

View File

@@ -85,12 +85,13 @@ namespace OpenRa.Game
buildItems.Clear(); buildItems.Clear();
renderer.Device.DisableScissor(); 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.RenderFrame,
Game.orderManager.FrameNumber, Game.orderManager.FrameNumber,
PerfHistory.items["render"].LastValue, PerfHistory.items["render"].LastValue,
PerfHistory.items["tick_time"].LastValue, PerfHistory.items["tick_time"].LastValue,
Game.LocalPlayer.GetTotalPower(), Game.LocalPlayer.powerDrained,
Game.LocalPlayer.powerProvided,
Game.LocalPlayer.IsReady ? "Yes" : "No" Game.LocalPlayer.IsReady ? "Yes" : "No"
), new int2(140, 5), Color.White); ), new int2(140, 5), Color.White);

View File

@@ -15,8 +15,8 @@ namespace OpenRa.Game
public int Cash; public int Cash;
public int Ore; public int Ore;
public int DisplayCash; public int DisplayCash;
int powerProvided; public int powerProvided;
int powerDrained; public int powerDrained;
public bool IsReady; public bool IsReady;
@@ -43,11 +43,6 @@ namespace OpenRa.Game
powerDrained -= dPower; powerDrained -= dPower;
} }
public int GetTotalPower()
{
return powerProvided - powerDrained;
}
public float GetSiloFullness() public float GetSiloFullness()
{ {
return (float)Ore / GetOreCapacity(); return (float)Ore / GetOreCapacity();