From db4802beda8e5fb2bd77d7c510bd72b6b0d7fd5e Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Sat, 24 Aug 2013 16:24:38 -0400
Subject: [PATCH] remove IGameApp dependencies. game app code can use services
 as needed

This could perhaps backfire (regarding coupling), but I think in the
end that this will have more 'pros' then 'cons' ...
---
 Blarg.GameFramework/Content/ContentManager.cs | 7 +------
 Blarg.GameFramework/Processes/GameProcess.cs  | 2 --
 Blarg.GameFramework/States/GameState.cs       | 2 --
 Blarg.GameFramework/States/StateManager.cs    | 6 +-----
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Blarg.GameFramework/Content/ContentManager.cs b/Blarg.GameFramework/Content/ContentManager.cs
index b20a663..45986a3 100644
--- a/Blarg.GameFramework/Content/ContentManager.cs
+++ b/Blarg.GameFramework/Content/ContentManager.cs
@@ -10,16 +10,11 @@ namespace Blarg.GameFramework.Content
 		Dictionary<Type, IContentLoaderBase> _loaders;
 
 		public bool IsLoaded { get; private set; }
-		public readonly IGameApp GameApp;
 
-		public ContentManager(IGameApp gameApp)
+		public ContentManager()
 		{
-			if (gameApp == null)
-				throw new ArgumentNullException("gameApp");
-
 			_loaders = new Dictionary<Type, IContentLoaderBase>();
 			IsLoaded = false;
-			GameApp = gameApp;
 		}
 
 		public void RegisterLoader(IContentLoaderBase loader)
diff --git a/Blarg.GameFramework/Processes/GameProcess.cs b/Blarg.GameFramework/Processes/GameProcess.cs
index 5c03c25..f4f7f57 100644
--- a/Blarg.GameFramework/Processes/GameProcess.cs
+++ b/Blarg.GameFramework/Processes/GameProcess.cs
@@ -6,7 +6,6 @@ namespace Blarg.GameFramework.Processes
 {
 	public class GameProcess : EventListener, IDisposable
 	{
-		public readonly IGameApp GameApp;
 		public readonly GameState GameState;
 		public readonly ProcessManager ProcessManager;
 
@@ -27,7 +26,6 @@ namespace Blarg.GameFramework.Processes
 
 			GameState = processManager.GameState;
 			ProcessManager = processManager;
-			GameApp = GameState.GameApp;
 		}
 
 		protected void SetFinished()
diff --git a/Blarg.GameFramework/States/GameState.cs b/Blarg.GameFramework/States/GameState.cs
index 5884002..7f967f0 100644
--- a/Blarg.GameFramework/States/GameState.cs
+++ b/Blarg.GameFramework/States/GameState.cs
@@ -7,7 +7,6 @@ namespace Blarg.GameFramework.States
 {
 	public abstract class GameState : EventListener, IDisposable
 	{
-		public IGameApp GameApp { get; private set; }
 		public readonly ProcessManager ProcessManager;
 		public readonly ScreenEffectManager EffectManager;
 		public readonly StateManager StateManager;
@@ -31,7 +30,6 @@ namespace Blarg.GameFramework.States
 			if (stateManager == null)
 				throw new ArgumentNullException("stateManager");
 
-			GameApp = stateManager.GameApp;
 			StateManager = stateManager;
 
 			EffectManager = new ScreenEffectManager();
diff --git a/Blarg.GameFramework/States/StateManager.cs b/Blarg.GameFramework/States/StateManager.cs
index 25abe31..0f8c250 100644
--- a/Blarg.GameFramework/States/StateManager.cs
+++ b/Blarg.GameFramework/States/StateManager.cs
@@ -16,19 +16,15 @@ namespace Blarg.GameFramework.States
 		bool _swapQueueHasOverlay;
 		bool _lastCleanedStatesWereAllOverlays;
 
-		public readonly IGameApp GameApp;
 		public readonly EventManager EventManager;
 
 		public int? LastReturnValue { get; private set; }
 
-		public StateManager(IGameApp gameApp, EventManager eventManager)
+		public StateManager(EventManager eventManager)
 		{
-			if (gameApp == null)
-				throw new ArgumentNullException("gameApp");
 			if (eventManager == null)
 				throw new ArgumentNullException("eventManager");
 
-			GameApp = gameApp;
 			EventManager = eventManager;
 
 			_states = new LinkedList<StateInfo>();