# HG changeset patch # User Alys Brooks # Date 2021-10-23 06:11:23 # Node ID 86a475320ee34f4c7358a30d8cc6df03abaa5f42 # Parent d1b7c709e38442e6b5eb848439e8a5b5698bff15 Fix status bar. diff --git a/isometric-park-fna/Engines/GameBridgeEngine.cs b/isometric-park-fna/Engines/GameBridgeEngine.cs --- a/isometric-park-fna/Engines/GameBridgeEngine.cs +++ b/isometric-park-fna/Engines/GameBridgeEngine.cs @@ -92,6 +92,7 @@ } game.in_zone = false; + game.in_active_zone = false; foreach (ref readonly var entity in ReadEntities()) { var areaComponent = GetComponent(entity); @@ -101,7 +102,8 @@ if (game.mouseGrid == square) { game.in_zone = true; - if (contractStatusComponent.status == ContractStatus.Active) + if ((contractStatusComponent.status == ContractStatus.Active) + || (contractStatusComponent.status == ContractStatus.Accepted)) { game.in_active_zone = true; } 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 @@ -794,7 +794,7 @@ { status_left = String.Format("{0:},{1:} {2} ({3})", this.mouseGrid.X, this.mouseGrid.Y, this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].status, - this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unzoned")); + this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unused")); } String header_left = String.Format("${0:}|{1:} \ue124", this.simulation.money, this.simulation.map.tree_count); 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 @@ -72,7 +72,6 @@ foreach (EnforcementLevel option in EnforcementLevel.GetValues(typeof(EnforcementLevel))) { - if (ImGui.Selectable(option.ToString())) { enforceTresspassing2 = option.ToString();