From c796e155e710a121075d19005470c352d740d3c4 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 18 Sep 2010 14:48:37 +1200 Subject: [PATCH] Fix UpdateTotals(); add debug info. --- OpenRA.Game/Game.cs | 4 ++-- OpenRA.Game/Traits/Player/PowerManager.cs | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index f48496ecfa..c16a829d12 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -292,9 +292,9 @@ namespace OpenRA public static Action AddChatLine = (c,n,s) => {}; - public static void Debug(string s) + public static void Debug(string s, params object[] args) { - AddChatLine(Color.White, "Debug", s); + AddChatLine(Color.White, "Debug", String.Format(s,args)); } public static void Disconnect() diff --git a/OpenRA.Game/Traits/Player/PowerManager.cs b/OpenRA.Game/Traits/Player/PowerManager.cs index 4b70d3e9cf..cafa2ec19e 100644 --- a/OpenRA.Game/Traits/Player/PowerManager.cs +++ b/OpenRA.Game/Traits/Player/PowerManager.cs @@ -45,7 +45,7 @@ namespace OpenRA.Traits { if (a.Owner != Player || !a.HasTrait()) return; - + Game.Debug("Added {0}: {1}",a.Info.Name, a.Trait().GetPowerUsage()); PowerDrain.Add(a, a.Trait().GetPowerUsage()); UpdateTotals(); } @@ -54,7 +54,7 @@ namespace OpenRA.Traits { if (a.Owner != Player || !a.HasTrait()) return; - + Game.Debug("Updated {0}: {1}->{2}",a.Info.Name, PowerDrain[a], newPower); PowerDrain[a] = newPower; UpdateTotals(); } @@ -63,13 +63,15 @@ namespace OpenRA.Traits { if (a.Owner != Player || !a.HasTrait()) return; - + Game.Debug("Removing {0}",a.Info.Name); PowerDrain.Remove(a); UpdateTotals(); } void UpdateTotals() { + totalProvided = 0; + totalDrained = 0; foreach (var p in PowerDrain.Values) { if (p > 0) @@ -77,6 +79,7 @@ namespace OpenRA.Traits else totalDrained -= p; } + Game.Debug("Provided: {0} Drained: {1}",totalProvided, totalDrained); } int nextPowerAdviceTime = 0;