now MapManager can load the background itself :)

kaczy93 · Nov 9, 2023 · 451abd6 · 451abd6
1 parent 38cd621
commit 451abd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CentrED/CentrEDGame.cs b/CentrED/CentrEDGame.cs
@@ -40,8 +40,7 @@ protected override void Initialize()
 
         NativeLibrary.Load(Path.Combine(AppContext.BaseDirectory, "x64", "zlib.dll"));
         Log.Start(LogTypes.All);
-        var background = Content.Load<Texture2D>("background");
-        MapManager = new MapManager(_gdm.GraphicsDevice, background);
+        MapManager = new MapManager(_gdm.GraphicsDevice);
         UIManager = new UIManager(_gdm.GraphicsDevice);
 
         base.Initialize();

diff --git a/CentrED/Map/MapManager.cs b/CentrED/Map/MapManager.cs
@@ -10,6 +10,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
+using static CentrED.Application;
 
 namespace CentrED.Map;
 
@@ -70,7 +71,7 @@ private void DarkenTexture(ushort[] pixels)
         }
     }
 
-    public MapManager(GraphicsDevice gd, Texture2D background)
+    public MapManager(GraphicsDevice gd)
     {
         _gfxDevice = gd;
         _mapEffect = new MapEffect(gd);
@@ -92,9 +93,9 @@ public MapManager(GraphicsDevice gd, Texture2D background)
             DepthFormat.Depth24);
         _postProcessRenderer = new PostProcessRenderer(gd);
         _spriteBatch = new SpriteBatch(gd);
-        _background = background;
+        _background = CEDGame.Content.Load<Texture2D>("background");
 
-        Client = Application.CEDClient;
+        Client = CEDClient;
         Client.LandTileReplaced += (tile, newId) => {
             LandTiles.Find(l => l.LandTile.Equals(tile))?.UpdateId(newId);
         };