alysbrooks-public » games » isometric-park-fna

Commit r433:86a475320ee3 public

parent | child
Description:
Fix status bar.
Commit status:
[Not Reviewed]
References:
m5-events
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r433:86a475320ee3 -

Show file before | Show file after | Show commentsHide comments
@@ -92,6 +92,7
92 }
92 }
93
93
94 game.in_zone = false;
94 game.in_zone = false;
95 game.in_active_zone = false;
95 foreach (ref readonly var entity in ReadEntities<AreaComponent>())
96 foreach (ref readonly var entity in ReadEntities<AreaComponent>())
96 {
97 {
97 var areaComponent = GetComponent<AreaComponent>(entity);
98 var areaComponent = GetComponent<AreaComponent>(entity);
@@ -101,7 +102,8
101 if (game.mouseGrid == square)
102 if (game.mouseGrid == square)
102 {
103 {
103 game.in_zone = true;
104 game.in_zone = true;
104 if (contractStatusComponent.status == ContractStatus.Active)
105 if ((contractStatusComponent.status == ContractStatus.Active)
106 || (contractStatusComponent.status == ContractStatus.Accepted))
105 {
107 {
106 game.in_active_zone = true;
108 game.in_active_zone = true;
107 }
109 }
Show file before | Show file after | Show commentsHide comments
@@ -794,7 +794,7
794 {
794 {
795 status_left = String.Format("{0:},{1:} {2} ({3})", this.mouseGrid.X, this.mouseGrid.Y,
795 status_left = String.Format("{0:},{1:} {2} ({3})", this.mouseGrid.X, this.mouseGrid.Y,
796 this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].status,
796 this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].status,
797 this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unzoned"));
797 this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unused"));
798 }
798 }
799
799
800 String header_left = String.Format("${0:}|{1:} \ue124", this.simulation.money, this.simulation.map.tree_count);
800 String header_left = String.Format("${0:}|{1:} \ue124", this.simulation.money, this.simulation.map.tree_count);
Show file before | Show file after | Show commentsHide comments
@@ -72,7 +72,6
72
72
73 foreach (EnforcementLevel option in EnforcementLevel.GetValues(typeof(EnforcementLevel)))
73 foreach (EnforcementLevel option in EnforcementLevel.GetValues(typeof(EnforcementLevel)))
74 {
74 {
75
76 if (ImGui.Selectable(option.ToString()))
75 if (ImGui.Selectable(option.ToString()))
77 {
76 {
78 enforceTresspassing2 = option.ToString();
77 enforceTresspassing2 = option.ToString();
You need to be logged in to leave comments. Login now