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 @@ -163,7 +163,6 @@ Content.RootDirectory = "Content"; - } protected override void Initialize() @@ -272,7 +271,7 @@ WorldBuilder.AddEngine(new TraceryBridgeEngine(this.grammar)); WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.batch, this.monoFont), 1); - WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(this, this.simulation, debugWindow.monoFont, debugWindow.italicFont, this.imGuiWindowBridgeEngine, this.gdm) , 2); + WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(this, this.simulation, this.imGuiWindowBridgeEngine, this.gdm) , 2); var contractWindow = WorldBuilder.CreateEntity(); WorldBuilder.SetComponent(contractWindow, new VisibilityComponent { visible = false }); WorldBuilder.SetComponent(contractWindow, new WindowTypeComponent { type = isometricparkfna.Messages.Window.Contracts }); diff --git a/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs b/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs --- a/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs +++ b/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs @@ -21,17 +21,14 @@ class ImGuiWindowRenderer : GeneralRenderer { - private ImFontPtr italicFont; private ImGuiWindowBridgeEngine BridgeEngine; private FNAGame game; private Simulation simulation; private GraphicsDeviceManager gdm; - public ImGuiWindowRenderer(FNAGame game, Simulation simulation, ImFontPtr font, ImFontPtr italicFont, ImGuiWindowBridgeEngine engine, GraphicsDeviceManager gdm) + public ImGuiWindowRenderer(FNAGame game, Simulation simulation, ImGuiWindowBridgeEngine engine, GraphicsDeviceManager gdm) { - // this.font = font; - this.italicFont = italicFont; this.BridgeEngine = engine; this.game = game; this.simulation = simulation; @@ -127,7 +124,7 @@ var area = GetComponent(data.entity).squares; - ContractWindow.Render(this.BridgeEngine.font, this.italicFont, this.BridgeEngine, data); + ContractWindow.Render(this.BridgeEngine.font, this.BridgeEngine.italicFont, this.BridgeEngine, data); break; case Window.News: diff --git a/isometric-park-fna/UI/ForestWindow.cs b/isometric-park-fna/UI/ForestWindow.cs --- a/isometric-park-fna/UI/ForestWindow.cs +++ b/isometric-park-fna/UI/ForestWindow.cs @@ -49,11 +49,6 @@ ImGui.SliderInt("Tree Clearing", ref new_tree_clearing, 0, Simulation.MAX_TREES_TO_CLEAR, string.Format("%d (${0})", new_tree_clearing*Simulation.TREE_CLEAR_COST)); sim.tree_clearing = new_tree_clearing; - ImGui.Checkbox("Enforce Trespassing.", ref enforceTresspassing1); - - ImGui.Text("Enforce tresspassing?"); - ImGui.SameLine(); - if (ImGui.BeginCombo("##tresspassing2", enforceTresspassing2)) {