overlay: renamed NO_COLUMN -> COLUMN_TYPE_NONE

Author: dalerank

src/overlays/city_overlay_apothecary.cpp

@@ -28,5 +28,5 @@ xstring city_overlay_apothecary::get_tooltip_for_building(tooltip_context* c, co
 int city_overlay_apothecary::get_column_height(const building *b) const {
     return b->house_size && b->subtype.house_level > 0
                 ? b->data.house.apothecary / 10 
-                : NO_COLUMN;
+                : COLUMN_TYPE_NONE;
 }

src/overlays/city_overlay_bandstand.cpp

@@ -38,5 +38,5 @@ int city_overlay_bandstand::get_column_height(const building *b) const {
         return musician_value / 10;
     }
 
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }

src/overlays/city_overlay_bazaar_access.cpp

@@ -21,7 +21,7 @@ city_overlay* city_overlay_for_bazaar_access() {
 
 int city_overlay_bazaar_access::get_column_height(const building *b) const {
     if (b->house_population <= 0) {
-        return NO_COLUMN;
+        return COLUMN_TYPE_NONE;
     }
 
     return std::clamp<int>(b->data.house.bazaar_access / 10, 0, 8);

src/overlays/city_overlay_courthouse.cpp

@@ -20,7 +20,7 @@ int city_overlay_courthouse::get_column_height(const building *b) const {
         return 0;
     }
 
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_courthouse::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_criminal.cpp

@@ -19,7 +19,7 @@ int city_overlay_crime::get_column_height(const building* b) const {
         int crime = b->house_criminal_active;
         return crime / 10;
     }
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_crime::get_tooltip_for_building(tooltip_context* c, const building* b) const {

src/overlays/city_overlay_damage.cpp

@@ -16,7 +16,7 @@ city_overlay* city_overlay_for_damage() {
 int city_overlay_damage::get_column_height(const building *b) const {
     auto model = model_get_building(b->type);
     if (b->prev_part_building_id || !model->damage_risk)
-        return NO_COLUMN;
+        return COLUMN_TYPE_NONE;
     return b->damage_risk / 100;
 }
 

src/overlays/city_overlay_dentist.cpp

@@ -12,7 +12,7 @@ city_overlay* city_overlay_for_dentist() {
 }
 
 int city_overlay_dentist::get_column_height(const building *b) const {
-    return b->house_size && b->data.house.dentist ? b->data.house.dentist / 10 : NO_COLUMN;
+    return b->house_size && b->data.house.dentist ? b->data.house.dentist / 10 : COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_dentist::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_desirability.cpp

@@ -86,7 +86,7 @@ inline bool city_overlay_desirability::show_figure(const figure *f) const {
 }
 
 int city_overlay_desirability::get_column_height(const building *b) const {
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 inline void city_overlay_desirability::draw_custom_top(vec2i pixel, tile2i point, painter &ctx) const {

src/overlays/city_overlay_education.cpp

@@ -24,7 +24,7 @@ city_overlay* city_overlay_for_academy() {
 }
 
 int city_overlay_education::get_column_height(const building *b) const {
-    return b->house_size && b->data.house.education ? b->data.house.education * 3 - 1 : NO_COLUMN;
+    return b->house_size && b->data.house.education ? b->data.house.education * 3 - 1 : COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_education::get_tooltip_for_building(tooltip_context *c, const building *b) const {
@@ -54,11 +54,11 @@ xstring city_overlay_academy::get_tooltip_for_building(tooltip_context *c, const
 }
 
 int city_overlay_academy::get_column_height(const building *b) const {
-    return b->house_size && b->data.house.academy ? b->data.house.academy / 10 : NO_COLUMN;
+    return b->house_size && b->data.house.academy ? b->data.house.academy / 10 : COLUMN_TYPE_NONE;
 }
 
 int city_overlay_libraries::get_column_height(const building *b) const {
-    return b->house_size && b->data.house.library ? b->data.house.library / 10 : NO_COLUMN;
+    return b->house_size && b->data.house.library ? b->data.house.library / 10 : COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_libraries::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_entertainment.cpp

@@ -10,7 +10,7 @@ city_overlay* city_overlay_for_entertainment() {
 }
 
 int city_overlay_entertainment::get_column_height(const building *b) const {
-    return b->house_size ? b->data.house.entertainment / 10 : NO_COLUMN;
+    return b->house_size ? b->data.house.entertainment / 10 : COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_entertainment::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_fertility.cpp

@@ -87,7 +87,7 @@ xstring city_overlay_fertility::get_tooltip_for_building(tooltip_context *c, con
 }
 
 int city_overlay_fertility::get_column_height(const building *b) const {
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 inline bool city_overlay_fertility::show_building(const building *b) const {

src/overlays/city_overlay_fire.cpp

@@ -16,11 +16,11 @@ int city_overlay_fire::get_column_height(const building *b) const {
     auto model = model_get_building(b->type);
 
     if (b->prev_part_building_id || b->fire_proof)
-        return NO_COLUMN;
+        return COLUMN_TYPE_NONE;
 
     if (b->type == BUILDING_HOUSE_VACANT_LOT || b->type == BUILDING_GARDENS
         || b->type == BUILDING_BANDSTAND || b->type == BUILDING_BOOTH) {
-        return NO_COLUMN;
+        return COLUMN_TYPE_NONE;
     }
 
     return b->fire_risk / 100;

src/overlays/city_overlay_fwd.h

@@ -1,6 +1,7 @@
 #pragma once
 
 enum e_column_type {
+    COLUMN_TYPE_NONE = -1,
     COLUMN_TYPE_RISK,
     COLUMN_TYPE_POSITIVE,
     COLUMN_TYPE_WATER_ACCESS,
@@ -9,6 +10,7 @@ enum e_column_type {
 };
 
 enum e_column_color {
+    COLUMN_COLOR_NONE = -1,
     COLUMN_COLOR_PLAIN = 0,
     COLUMN_COLOR_YELLOW = 3,
     COLUMN_COLOR_ORANGE = 6,

src/overlays/city_overlay_health.cpp

@@ -11,8 +11,8 @@ city_overlay* city_overlay_for_health() {
 }
 
 int city_overlay_health::get_column_height(const building *b) const {
-    if (!b->house_size || !b->house_population) {
-        return NO_COLUMN;
+    if (!b->house_size || b->house_population <= 0) {
+        return COLUMN_TYPE_NONE;
     }
 
     if (b->disease_days > 0) {
@@ -22,6 +22,16 @@ int city_overlay_health::get_column_height(const building *b) const {
     return (100 - b->common_health) / 10;
 }
 
+e_column_color city_overlay_health::get_column_color(const building *b) const {
+    if (!b->house_size || b->house_population <= 0) {
+        return COLUMN_COLOR_NONE;
+    }
+
+    if (b->disease_days > 0) {
+        return COLUMN_COLOR_RED;
+    }
+}
+
 xstring city_overlay_health::get_tooltip_for_building(tooltip_context *c, const building *b) const {
     if (b->disease_days > 0) {
         return ui::str(66, 131);

src/overlays/city_overlay_health.h

@@ -4,6 +4,7 @@
 
 struct city_overlay_health : public city_overlay_t<OVERLAY_HEALTH> {
     virtual int get_column_height(const building *b) const override;
+    virtual e_column_color get_column_color(const building *b) const override;
     virtual xstring get_tooltip_for_building(tooltip_context *c, const building *b) const override;
 };
 

src/overlays/city_overlay_juggler.cpp

@@ -18,7 +18,7 @@ int city_overlay_booth::get_column_height(const building *b) const {
         }
     }
 
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_booth::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_labor.cpp

@@ -23,12 +23,12 @@ bool city_overlay_labor::show_figure(const figure *f) const {
 
 int city_overlay_labor::get_column_height(const building *b) const {
     if (b->state == BUILDING_STATE_VALID) {
-        return NO_COLUMN;
+        return COLUMN_TYPE_NONE;
     }
 
     int need_workers = model_get_building(b->type)->laborers;
     if (!need_workers) {
-        return NO_COLUMN;
+        return COLUMN_TYPE_NONE;
     }
 
     int percentage = ((building*)b)->worker_percentage();

src/overlays/city_overlay_mortuary.cpp

@@ -12,7 +12,7 @@ city_overlay* city_overlay_for_mortuary() {
 }
 
 int city_overlay_mortuary::get_column_height(const building *b) const {
-    return b->house_size && b->data.house.mortuary ? b->data.house.mortuary / 10 : NO_COLUMN;
+    return b->house_size && b->data.house.mortuary ? b->data.house.mortuary / 10 : COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_mortuary::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_other.cpp

@@ -43,7 +43,7 @@ int city_overlay_food_stocks::get_column_height(const building *b) const {
         if (pct_stocks <= 200)
             return 1;
     }
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_food_stocks::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_pavilion.cpp

@@ -29,7 +29,7 @@ bool city_overlay_pavilion::show_figure(const figure *f) const {
 int city_overlay_pavilion::get_column_height(const building *b) const {
     return (b->house_size)
         ? b->data.house.pavillion_dancer / 10 
-        : NO_COLUMN;
+        : COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_pavilion::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_physician.cpp

@@ -16,7 +16,7 @@ int city_overlay_physician::get_column_height(const building *b) const {
              ? b->data.house.physician
                 ? b->data.house.physician / 10
                 : 0
-             : NO_COLUMN;
+             : COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_physician::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_religion.cpp

@@ -50,7 +50,7 @@ city_overlay* city_overlay_for_religion_bast() {
 int city_overlay_religion::get_column_height(const building *b) const {
     return b->house_size && b->data.house.num_gods
                 ? b->data.house.num_gods * 17 / 10
-                : NO_COLUMN;
+                : COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_religion::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_religion.h

@@ -19,7 +19,7 @@ struct city_overlay_religion_god : public city_overlay_t<TYPE> {
 
     virtual int get_column_height(const building *b) const override {
         if (!b->house_size) {
-            return NO_COLUMN;
+            return COLUMN_TYPE_NONE;
         }
 
         int value = 0;

src/overlays/city_overlay_risks.cpp

@@ -60,7 +60,7 @@ bool city_overlay_problems::show_figure(const figure *f) const {
 }
 
 int city_overlay_problems::get_column_height(const building *b) const {
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 bool city_overlay_problems::show_building(const building *b) const {
@@ -113,7 +113,7 @@ bool city_overlay_native::draw_custom_footprint(vec2i pixel, tile2i tile, painte
 }
 
 int city_overlay_native::get_column_height(const building *b) const {
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 bool city_overlay_native::show_building(const building *b) const {

src/overlays/city_overlay_routing.cpp

@@ -31,7 +31,7 @@ inline bool city_overlay_routing::show_figure(const figure *f) const {
 }
 
 int city_overlay_routing::get_column_height(const building *b) const {
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 inline void city_overlay_routing::draw_custom_top(vec2i pixel, map_point point, painter &ctx) const {

src/overlays/city_overlay_school.cpp

@@ -14,7 +14,7 @@ city_overlay* city_overlay_for_scribal_school() {
 
 int city_overlay_schools::get_column_height(const building *b) const {
     if (b->house_size == 0) {
-        return NO_COLUMN;
+        return COLUMN_TYPE_NONE;
     }
 
     return b->data.house.school / 10;

src/overlays/city_overlay_senet_house.cpp

@@ -10,7 +10,7 @@ city_overlay *city_overlay_for_senet_house() {
 }
 
 int city_overlay_senet_house::get_column_height(const building *b) const {
-    return b->house_size ? b->data.house.senet_player / 10 : NO_COLUMN;
+    return b->house_size ? b->data.house.senet_player / 10 : COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_senet_house::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_tax_income.cpp

@@ -22,7 +22,7 @@ int city_overlay_tax_income::get_column_height(const building *b) const {
         }
     }
 
-    return NO_COLUMN;
+    return COLUMN_TYPE_NONE;
 }
 
 xstring city_overlay_tax_income::get_tooltip_for_building(tooltip_context *c, const building *b) const {

src/overlays/city_overlay_water.cpp

@@ -100,5 +100,5 @@ xstring city_overlay_water::get_tooltip_for_grid_offset(tooltip_context* c, int
 }
 
 int city_overlay_water::get_column_height(const building *b) const {
-    return b->house_size ? b->data.house.water_supply * 17 / 10 : NO_COLUMN;
+    return b->house_size ? b->data.house.water_supply * 17 / 10 : COLUMN_TYPE_NONE;
 }