# HG changeset patch
# User Alys Brooks <alysbrooks@fastmail.com>
# Date 2021-07-11 22:38:06
# Node ID 1936e6b7a8a6f901a0ee6da0d2eb942bb8ccab40
# Parent  0a4578ea88be21e8333b2012d11c84cc2c38f144

Ensure changing the font is applied to SpriteFont.

diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache
index e9e6a1f995220f23b1e8b97d3101d3ea3f28c7d0..73f94effcb2041082426754fa6e667b7fb095833
GIT binary patch
literal 17897
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
TheoiQM8H01_~jw}UCRFe+95QI

diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs
--- a/isometric-park-fna/FNAGame.cs
+++ b/isometric-park-fna/FNAGame.cs
@@ -393,13 +393,8 @@
         this.remainingDialog.Enqueue(DialogTrees.flatten(DialogTrees.testTree, this.grammar));
 #endif
 
-        //font = fontBakeResult.CreateSpriteFont(GraphicsDevice);
-
         this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0);
 
-        // this.setFont(options.fontName, options.fontSize);
-        // debugWindow.setMonoFont(debugWindow.addFont(options.fontName, options.fontSize, false));
-
         Logging.Success("Content loaded.");
     }
 
@@ -408,7 +403,7 @@
     {
         var font_path = DebugWindow.fonts[font];
 
-        var baked = TtfFontBaker.Bake(File.OpenRead(@"Content/iosevka-term-extendedmedium.ttf"),
+        var baked = TtfFontBaker.Bake(File.OpenRead(font_path),
                 size,
                 1024,
                 1024,
@@ -744,7 +739,6 @@
     #endif
 
     #region draw_cursor
-    //drawTileAt((int)this.mouseGrid.X, (int)this.mouseGrid.Y, 2, 1, 0.85f); //between tiles and gridlines
 
         if (MathUtils.Between(this.mouseGrid.X, 0, this.simulation.map.MapWidth)
                 && MathUtils.Between(this.mouseGrid.Y, 0, this.simulation.map.MapHeight))
@@ -787,7 +781,6 @@
             {
                 for (int j = 0; j < this.simulation.map.MapWidth; j += 1)
                 {
-
                     if (this.simulation.map.cells[i][j].hasTree)
                     { //until we actually simulate:
                         drawTileAt(i, j, 142, 2);
@@ -803,7 +796,6 @@
                     else if (this.simulation.map.cells[i][j].status == CellStatus.DeadTree) {
                         drawTileAt(i, j, 141, 2);
                         // System.Console.WriteLine(String.Format("Drew Dead Tree at {0},{1}", i, j));
-
                     }
                 }
             }
@@ -832,7 +824,6 @@
         {
             has_tree = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].hasTree;
         }
-        //*/
 
         String status_left = "";
         if (MathUtils.BetweenExclusive(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.BetweenExclusive(this.mouseGrid.Y, -1, this.simulation.map.MapHeight))