refactor: house_tax_coverage option moved from building common class

Author: dalerank

src/building/building.h

@@ -169,7 +169,6 @@ class building {
     e_building_type type;
     short native_meeting_center_id;
     unsigned short road_network_id;
-    //unsigned short creation_sequence_index;
     short houses_covered;
     short percentage_houses_covered;
     short distance_from_entry;
@@ -205,7 +204,6 @@ class building {
     unsigned char fire_proof; // cannot catch fire or collapse
     unsigned char damage_proof;
     unsigned char map_random_7bit;
-    unsigned char house_tax_coverage;
     unsigned short tax_collector_id;
     short formation_id;
     int tax_income_or_storage;

src/building/building_debug_properties.cpp

@@ -26,7 +26,7 @@ void game_debug_show_properties_object(pcstr prefix, building *b) {
         bstring256 type_name; type_name.printf("%s [%d]", token::find_name(e_building_type_tokens, b->type), b->type);
         game_debug_show_property("type", type_name);
         game_debug_show_property("road_network_id", b->road_network_id);
-        game_debug_show_property("houses_covered", b->houses_covered);
+        //game_debug_show_property("houses_covered", b->houses_covered);
         game_debug_show_property("percentage_houses_covered", b->percentage_houses_covered);
         //game_debug_show_property("house_population", b->house_population);
         //game_debug_show_property("house_population_room", b->house_population_room);
@@ -59,7 +59,7 @@ void game_debug_show_properties_object(pcstr prefix, building *b) {
         game_debug_show_property("health_proof", b->health_proof);
         game_debug_show_property("fire_proof", b->fire_proof);
         game_debug_show_property("damage_proof", b->damage_proof);
-        game_debug_show_property("house_tax_coverage", b->house_tax_coverage);
+        //game_debug_show_property("house_tax_coverage", b->house_tax_coverage);
         game_debug_show_property("tax_collector_id", b->tax_collector_id);
         game_debug_show_property("formation_id", b->formation_id);
         game_debug_show_property("tax_income_or_storage", b->tax_income_or_storage);

src/building/building_house.cpp

@@ -199,6 +199,7 @@ void building_house::bind_dynamic(io_buffer *iob, size_t version) {
     iob->bind(BIND_SIGNATURE_UINT8, &d.criminal_active);
     iob->bind(BIND_SIGNATURE_INT16, &d.highest_population);
     iob->bind(BIND_SIGNATURE_INT16, &d.population);
+    iob->bind(BIND_SIGNATURE_UINT8, &d.tax_coverage);
 }
 
 int building_house::get_fire_risk(int value) const {

src/building/building_house.h

@@ -57,6 +57,7 @@ class building_house : public building_impl {
         uint8_t water_supply;
         uint8_t house_happiness;
         uint8_t criminal_active;
+        uint8_t tax_coverage;
     };
 
     virtual void on_create(int orientation) override;

src/city/city_buildings.cpp

@@ -284,7 +284,7 @@ io_buffer *iob_buildings = new io_buffer([] (io_buffer *iob, size_t version) {
         iob->bind(BIND_SIGNATURE_UINT8, &b->fire_proof);
 
         iob->bind(BIND_SIGNATURE_UINT8, &b->map_random_7bit); // 20 (workcamp 1)
-        iob->bind(BIND_SIGNATURE_UINT8, &b->house_tax_coverage);
+        iob->bind____skip(1);
         iob->bind(BIND_SIGNATURE_UINT8, &b->health_proof);
         iob->bind(BIND_SIGNATURE_INT16, &b->formation_id);
 

src/city/finance.cpp

@@ -149,12 +149,15 @@ void city_finance_estimate_taxes() {
 
     buildings_valid_do([] (building &b) {
         auto house = b.dcast_house();
-
-        if (!(house && b.house_size || b.house_tax_coverage)) {
+        if (!house) {
             return;
         }
 
         auto &housed = house->runtime_data();
+        if (!housed.tax_coverage) {
+            return;
+        }
+
         int is_nobles = (housed.level >= HOUSE_COMMON_MANOR);
         int tax_multiplier = model_get_house(housed.level)->tax_multiplier;
         int level_tax_rate_multiplier = difficulty_adjust_money(tax_multiplier);
@@ -216,7 +219,7 @@ static void city_finance_collect_monthly_taxes() {
         city_data.population.at_level[housed.level] += population;
 
         int tax = population * trm;
-        if (b.house_tax_coverage) {
+        if (housed.tax_coverage) {
             if (is_nobles) {
                 city_data.taxes.taxed_nobles += population;
                 city_data.taxes.monthly.collected_nobles += tax;

src/city/houses.cpp

@@ -155,9 +155,15 @@ void city_t::house_service_decay_services() {
 void city_t::house_service_decay_tax_collector() {
     OZZY_PROFILER_SECTION("Game/Run/Tick/Tax Collector Update");
     for (int i = 1; i < MAX_BUILDINGS; i++) {
-        building* b = building_get(i);
-        if (b->state == BUILDING_STATE_VALID && b->house_tax_coverage)
-            b->house_tax_coverage--;
+        auto house = building_get(i)->dcast_house();
+        if (!house && house->state() != BUILDING_STATE_VALID) {
+            continue;
+        } 
+        
+        auto &housed = house->runtime_data();
+        if (housed.tax_coverage) {
+            housed.tax_coverage--;
+        }
     }
 }
 

src/city/labor.cpp

@@ -399,13 +399,12 @@ void city_labor_t::set_building_worker_weight() {
             continue;
 
         e_labor_category cat = category_for_building(b);
-        if (cat == LABOR_CATEGORY_WATER_HEALTH)
+        if (cat == LABOR_CATEGORY_WATER_HEALTH) {
             b->percentage_houses_covered = water_per_10k_per_building;
-        else if (cat >= 0) {
+        } else if (cat >= 0) {
             b->percentage_houses_covered = 0;
             if (b->houses_covered) {
-                b->percentage_houses_covered
-                  = calc_percentage(100 * b->houses_covered, categories[cat].total_houses_covered);
+                b->percentage_houses_covered = calc_percentage(100 * b->houses_covered, categories[cat].total_houses_covered);
             }
         }
     }

src/figuretype/figure_tax_collector.cpp

@@ -130,7 +130,7 @@ int figure_tax_collector::provide_service() {
             return;
         }
 
-        if (b->house_size && house->house_population() > 0) {
+        if (house->house_population() > 0) {
             int tax_multiplier = model_get_house(house->house_level())->tax_multiplier;
             if (tax_multiplier > max_tax_multiplier) {
                 max_tax_multiplier = tax_multiplier;
@@ -144,7 +144,7 @@ int figure_tax_collector::provide_service() {
                 f->data.taxman.reach_taxed++;
             }
             b->tax_collector_id = f->home()->id;
-            b->house_tax_coverage = 50;
+            house->runtime_data().tax_coverage = 50;
         }
     });
     base.min_max_seen = max_tax_rate;

src/overlays/city_overlay_tax_income.cpp

@@ -1,6 +1,6 @@
 #include "city_overlay_tax_income.h"
 
-#include "building/building.h"
+#include "building/building_house.h"
 #include "graphics/elements/tooltip.h"
 #include "core/calc.h"
 #include "city/finance.h"
@@ -24,12 +24,17 @@ int city_overlay_tax_income::get_column_height(const building *b) const {
 }
 
 xstring city_overlay_tax_income::get_tooltip_for_building(tooltip_context *c, const building *b) const {
+    auto house = ((building*)b)->dcast_house();
+    if (!house) {
+        return ui::str(66, 43);
+    }
+
     int denarii = calc_adjust_with_percentage(b->tax_income_or_storage / 2, city_finance_tax_percentage());
     if (denarii > 0) {
         c->has_numeric_prefix = 1;
         c->numeric_prefix = denarii;
         return ui::str(66, 45);
-    } else if (b->house_tax_coverage > 0) {
+    } else if (house->runtime_data().tax_coverage > 0) {
         return ui::str(66, 44);
     } else {
         return ui::str(66, 43);

src/window/window_house_info.cpp

@@ -128,7 +128,7 @@ void info_window_house::init(object_info &c) {
     ui["people_text"].text_var("%s ( %s )", people_text.c_str(), adv_people_text.c_str());
 
     bstring256 tax_info_text;
-    if (house->base.house_tax_coverage) {
+    if (housed.tax_coverage) {
         int pct = calc_adjust_with_percentage(house->base.tax_income_or_storage / 2, city_finance_tax_percentage());
         tax_info_text.printf("%s %u %s", ui::str(127, 24), pct, ui::str(127, 25));
     } else {