From b4109b12caa5c27c886d68cab853c6ef7db9d21f Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 9 Jan 2011 13:23:29 +1300
Subject: [PATCH] less dumb PlayerResources init

---
 OpenRA.Game/Traits/Player/PlayerResources.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/OpenRA.Game/Traits/Player/PlayerResources.cs b/OpenRA.Game/Traits/Player/PlayerResources.cs
index 383c743f51..ad3625fd9a 100644
--- a/OpenRA.Game/Traits/Player/PlayerResources.cs
+++ b/OpenRA.Game/Traits/Player/PlayerResources.cs
@@ -19,19 +19,21 @@ namespace OpenRA.Traits
 		public readonly int InitialOre = 0;
 		public readonly int AdviceInterval = 250;
 
-		public object Create(ActorInitializer init) { return new PlayerResources(init.self); }
+		public object Create(ActorInitializer init) { return new PlayerResources(init.self, this); }
 	}
 
 	public class PlayerResources : ITick
 	{
-		Player Owner;
+		readonly Player Owner;
 		int AdviceInterval;
-		public PlayerResources(Actor self)
+
+		public PlayerResources(Actor self, PlayerResourcesInfo info)
 		{
 			Owner = self.Owner;
-			Cash = self.Info.Traits.Get<PlayerResourcesInfo>().InitialCash;
-			Ore = self.Info.Traits.Get<PlayerResourcesInfo>().InitialOre;
-			AdviceInterval = self.Info.Traits.Get<PlayerResourcesInfo>().AdviceInterval;
+
+			Cash = info.InitialCash;
+			Ore = info.InitialOre;
+			AdviceInterval = info.AdviceInterval;
 		}
 
 		[Sync]