refactor: highest_population moved from building common class

Author: dalerank

src/building/building.h

@@ -174,7 +174,6 @@ class building {
     short percentage_houses_covered;
     short house_population;
     short distance_from_entry;
-    short house_highest_population;
     short house_unreachable_ticks;
     tile2i road_access;
     short figure_spawn_delay;

src/building/building_debug_properties.cpp

@@ -31,7 +31,7 @@ void game_debug_show_properties_object(pcstr prefix, building *b) {
         game_debug_show_property("house_population", b->house_population);
         //game_debug_show_property("house_population_room", b->house_population_room);
         game_debug_show_property("distance_from_entry", b->distance_from_entry);
-        game_debug_show_property("house_highest_population", b->house_highest_population);
+        //game_debug_show_property("house_highest_population", b->house_highest_population);
         game_debug_show_property("house_unreachable_ticks", b->house_unreachable_ticks);
         game_debug_show_property("road_access", b->road_access);
         game_debug_show_property("figure_spawn_delay", b->figure_spawn_delay);

src/building/building_house.cpp

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

src/building/building_house.h

@@ -18,9 +18,10 @@ class building_house : public building_impl {
 
     struct runtime_data_t {
         e_house_level level;
-        uint8_t is_merged;
         uint16_t foods[8];
         uint16_t inventory[8];
+        uint16_t highest_population;
+        uint8_t is_merged;
         uint8_t booth_juggler;
         uint8_t bandstand_juggler;
         uint8_t bandstand_musician;

src/city/city_buildings.cpp

@@ -251,7 +251,7 @@ io_buffer *iob_buildings = new io_buffer([] (io_buffer *iob, size_t version) {
         iob->bind(BIND_SIGNATURE_INT16, &b->house_population);
         iob->bind____skip(2);
         iob->bind(BIND_SIGNATURE_INT16, &b->distance_from_entry);
-        iob->bind(BIND_SIGNATURE_INT16, &b->house_highest_population);
+        iob->bind____skip(2);
 
         iob->bind(BIND_SIGNATURE_INT16, &b->house_unreachable_ticks);
         iob->bind(BIND_SIGNATURE_TILE2I, b->road_access);

src/city/city_house_population.cpp

@@ -86,9 +86,8 @@ void city_t::house_population_update_room() {
             }
 
             city_population_add_capacity(house->house_population(), max_pop);
-            if (house->house_population() > house->base.house_highest_population) {
-                house->base.house_highest_population = house->house_population();
-            }
+            auto &housed = house->runtime_data();
+            housed.highest_population = std::max<short>(housed.highest_population, house->house_population());
         }
     }
 }

src/figuretype/figure_market_buyer.cpp

@@ -163,7 +163,7 @@ void distribute_market_resources(building* b, building* market) {
         level++;
     }
 
-    int max_food_stocks = 4 * b->house_highest_population;
+    int max_food_stocks = 4 * housed.highest_population;
     int food_types_stored_max = 0;
     for (int i = INVENTORY_MIN_FOOD; i < INVENTORY_MAX_FOOD; i++) {
         if (housed.foods[i] >= max_food_stocks)