Clean up some more unused test code

MonoGame · Jul 28, 2012 · 93a291a · 93a291a
1 parent 17f676c
commit 93a291a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 32 deletions.
diff --git a/MonoGame.Framework/Android/AndroidGameActivity.cs b/MonoGame.Framework/Android/AndroidGameActivity.cs
@@ -72,39 +72,17 @@ protected override void OnResume()
             if (Resumed != null)
                 Resumed(this, EventArgs.Empty);
 
-            if (restarting)
-            {
-                if (Game.Window.GraphicsContext == null || Game.Window.GraphicsContext.IsDisposed)
-                {
-                    //Game.Window.GraphicsContext = new OpenTK.Graphics.GraphicsContext(Game.Window.GraphicsMode, Game.Window.WindowInfo);
-                }
-            }
-            restarting = false;
-
             var deviceManager = (IGraphicsDeviceManager)Game.Services.GetService(typeof(IGraphicsDeviceManager));
             if (deviceManager == null)
                 return;
             (deviceManager as GraphicsDeviceManager).ForceSetFullScreen();
             Game.Window.RequestFocus();
         }
 
-        bool restarting = false;
         protected override void OnRestart()
         {
             base.OnRestart();
             Game.Window.OnRestart();
-
-            restarting = true;
-        }
-
-        protected override void OnStart()
-        {
-            base.OnStart();
-        }
-
-        protected override void OnStop()
-        {
-            base.OnStop();
         }
     }
 

diff --git a/MonoGame.Framework/Content/ContentManager.cs b/MonoGame.Framework/Content/ContentManager.cs
@@ -68,8 +68,6 @@ public partial class ContentManager : IDisposable
 		private static object ContentManagerLock = new object();
         private static List<ContentManager> ContentManagers = new List<ContentManager>();
 
-        private Dictionary<string, string> loadedAssetPaths = new Dictionary<string, string>();
-
         private static void AddContentManager(ContentManager contentManager)
         {
             lock (ContentManagerLock)
@@ -193,16 +191,9 @@ protected virtual Stream OpenStream(string assetName)
 			Stream stream;
 			try
             {
-				string assetPath;
-                if (!loadedAssetPaths.TryGetValue(assetName, out assetPath))
-                {
-                    assetPath = Path.Combine(_rootDirectory, assetName) + ".xnb";
-                }
+                string assetPath = Path.Combine(_rootDirectory, assetName) + ".xnb";
                 stream = TitleContainer.OpenStream(assetPath);
 
-                // The stream was opened without exception so the path must be valid
-                loadedAssetPaths[assetName] = assetPath;
-
 #if ANDROID
                 // Read the asset into memory in one go. This results in a ~50% reduction
                 // in load times on Android due to slow Android asset streams.