runtime data for granary moved from building class

Author: dalerank

src/building/building.h

@@ -212,9 +212,6 @@ class building {
     short formation_id;
     union impl_data_t {
         char data[512] = { 0 };
-        struct granary_t {
-            short resource_stored[16];
-        } granary;
         struct {
             e_resource resource_id;
         } warehouse;

src/building/building_bazaar.cpp

@@ -15,6 +15,7 @@
 #include "grid/routing/routing.h"
 #include "graphics/image.h"
 #include "window/building/distribution.h"
+#include "building/building_granary.h"
 #include "graphics/graphics.h"
 #include "game/game.h"
 #include "widget/city/ornaments.h"
@@ -40,7 +41,7 @@ struct resource_data {
             return;
         }
 
-        if (b.data.granary.resource_stored[resource] < 100) {
+        if (granary->runtime_data().resource_stored[resource] < 100) {
             return;
         }
 

src/building/building_granary.cpp

@@ -67,7 +67,7 @@ int building_granary::amount(e_resource resource) const {
         return 0;
     }
 
-    return data.granary.resource_stored[resource];
+    return runtime_data().resource_stored[resource];
 }
 
 bool building_granary::is_accepting(e_resource resource) {
@@ -105,7 +105,8 @@ int building_granary::add_resource(e_resource resource, bool is_produced, int am
         return -1;
     }
 
-    if (data.granary.resource_stored[RESOURCE_NONE] <= 0) {
+    auto &d = runtime_data();
+    if (d.resource_stored[RESOURCE_NONE] <= 0) {
         return -1; // no space
     }
 
@@ -117,9 +118,9 @@ int building_granary::add_resource(e_resource resource, bool is_produced, int am
         city_resource_add_produced_to_granary(amount);
     }
 
-    int deliverable_amount = std::min<int>(data.granary.resource_stored[RESOURCE_NONE], amount);
-    data.granary.resource_stored[resource] += deliverable_amount;
-    data.granary.resource_stored[RESOURCE_NONE] -= deliverable_amount;
+    int deliverable_amount = std::min<int>(d.resource_stored[RESOURCE_NONE], amount);
+    d.resource_stored[resource] += deliverable_amount;
+    d.resource_stored[RESOURCE_NONE] -= deliverable_amount;
     return amount - deliverable_amount;
 }
 
@@ -133,19 +134,20 @@ int building_granary::total_stored() const {
 }
 
 int building_granary::freespace() const {
-    return data.granary.resource_stored[RESOURCE_NONE];
+    return runtime_data().resource_stored[RESOURCE_NONE];
 }
 
 int building_granary::remove_resource(e_resource resource, int amount) {
     if (amount <= 0) {
         return 0;
     }
 
-    int removed = std::min<int>(data.granary.resource_stored[resource], amount);
+    auto &d = runtime_data();
+    int removed = std::min<int>(d.resource_stored[resource], amount);
 
     city_resource_remove_from_granary(resource, removed);
-    data.granary.resource_stored[resource] -= removed;
-    data.granary.resource_stored[RESOURCE_NONE] += removed;
+    d.resource_stored[resource] -= removed;
+    d.resource_stored[RESOURCE_NONE] += removed;
 
     return amount - removed;
 }
@@ -252,7 +254,8 @@ int building_granary_for_storing(tile2i tile, e_resource resource, int distance_
                 continue;
         }
 
-        if (granary->data.granary.resource_stored[RESOURCE_NONE] >= ONE_LOAD) {
+        const auto &d = granary->runtime_data();
+        if (d.resource_stored[RESOURCE_NONE] >= ONE_LOAD) {
             // there is room
             int dist = calc_distance_with_penalty(vec2i(granary->tilex() + 1, granary->tiley() + 1), tile, distance_from_entry, granary->distance_from_entry());
             if (dist < min_dist) {
@@ -295,7 +298,8 @@ int building_getting_granary_for_storing(tile2i tile, e_resource resource, int d
         if (granary->is_getting(resource) || granary->is_empty_all())
             continue;
 
-        if (granary->data.granary.resource_stored[RESOURCE_NONE] > ONE_LOAD) {
+        const auto &d = granary->runtime_data();
+        if (d.resource_stored[RESOURCE_NONE] > ONE_LOAD) {
             // there is room
             int dist = calc_distance_with_penalty(vec2i(granary->tilex() + 1, granary->tiley() + 1), tile, distance_from_entry, granary->distance_from_entry());
             if (dist < min_dist) {
@@ -481,21 +485,22 @@ void building_granary_draw_anim(building &b, vec2i point, tile2i tile, color mas
 }
 
 void building_granary::on_create(int orientation) {
-    data.granary.resource_stored[RESOURCE_NONE] = capacity_stored();
+    runtime_data().resource_stored[RESOURCE_NONE] = capacity_stored();
     base.storage_id = building_storage_create(BUILDING_GRANARY);
 }
 
 void building_granary::update_day() {
     building_impl::update_day();
-    data.granary.resource_stored[RESOURCE_NONE] = capacity_stored() - total_stored();
+    runtime_data().resource_stored[RESOURCE_NONE] = capacity_stored() - total_stored();
 }
 
 void building_granary::bind_dynamic(io_buffer *iob, size_t version) {
     iob->bind____skip(2);
     iob->bind____skip(2);
 
+    auto &d = runtime_data();
     for (int i = 0; i < RESOURCES_MAX; i++) {
-        iob->bind(BIND_SIGNATURE_INT16, &data.granary.resource_stored[i]);
+        iob->bind(BIND_SIGNATURE_INT16, &d.resource_stored[i]);
     }
 }
 
@@ -553,10 +558,12 @@ textid building_granary::get_tooltip() const {
 void building_granary::draw_stores(vec2i point, color color_mask, painter &ctx) {
     int last_spot_filled = 0;
     int resources_id = granary_m.anim["resources"].first_img();
+
+    const auto &d = runtime_data();
     for (int r = 1; r < 9; r++) {
-        if (data.granary.resource_stored[r] > 0) {
-            int spots_filled = ceil((float)(data.granary.resource_stored[r] - 199) / (float)400); // number of "spots" occupied by food
-            if (spots_filled == 0 && data.granary.resource_stored[r] > 0)
+        if (d.resource_stored[r] > 0) {
+            int spots_filled = ceil((float)(d.resource_stored[r] - 199) / (float)400); // number of "spots" occupied by food
+            if (spots_filled == 0 && d.resource_stored[r] > 0)
                 spots_filled = 1;
 
             for (int spot = last_spot_filled; spot < last_spot_filled + spots_filled; spot++) {

src/building/building_granary.h

@@ -28,6 +28,10 @@ class building_granary : public building_storage {
     building_granary(building &b) : building_storage(b) {}
     virtual building_granary *dcast_granary() override { return this; }
 
+    struct runtime_data_t {
+        short resource_stored[16];
+    };
+
     virtual void on_create(int orientation) override;
     virtual void spawn_figure() override;
     virtual e_sound_channel_city sound_channel() const override { return SOUND_CHANNEL_CITY_GRANARY; }
@@ -50,6 +54,9 @@ class building_granary : public building_storage {
     int capacity_stored() const { return 3200; }
     int allow_food_types() const { return 4; }
 
+    runtime_data_t &runtime_data() { return *(runtime_data_t *)data.data; }
+    const runtime_data_t &runtime_data() const { return *(runtime_data_t *)data.data; }
+
     void bless();
     granary_task_status determine_worker_task();
     void draw_stores(vec2i point, color color_mask, painter &ctx);

src/city/city_resource.cpp

@@ -334,31 +334,34 @@ static void calculate_available_food() {
 
     buildings_valid_do([] (building &b) {
         b.has_road_access = false;
-        if (map_has_road_access(b.tile, b.size)) { // map_has_road_access_granary(b->tile.x(), b->tile.y(), 0)
-            b.has_road_access = true;
-            int pct_workers = calc_percentage<int>(b.num_workers, model_get_building(b.type)->laborers);
-            if (pct_workers < 100) {
-                city_data.resource.granaries.understaffed++;
-            }
+        if (!map_has_road_access(b.tile, b.size)) { // map_has_road_access_granary(b->tile.x(), b->tile.y(), 0)
+            return;
+        }
 
-            int amount_stored = 0;
-            for (int r = RESOURCE_FOOD_MIN; r < RESOURCES_FOODS_MAX; r++) {
-                amount_stored += b.data.granary.resource_stored[r];
-            }
+        b.has_road_access = true;
+        int pct_workers = calc_percentage<int>(b.num_workers, model_get_building(b.type)->laborers);
+        if (pct_workers < 100) {
+            city_data.resource.granaries.understaffed++;
+        }
 
-            if (pct_workers < 50) {
-                city_data.resource.granaries.not_operating++;
-                if (amount_stored > 0)
-                    city_data.resource.granaries.not_operating_with_food++;
+        int amount_stored = 0;
+        const auto &granary = b.dcast_granary()->runtime_data();
+        for (int r = RESOURCE_FOOD_MIN; r < RESOURCES_FOODS_MAX; r++) {
+            amount_stored += granary.resource_stored[r];
+        }
 
-            } else {
-                city_data.resource.granaries.operating++;
-                for (int r = 0; r < RESOURCES_FOODS_MAX; r++)
-                    city_data.resource.granary_food_stored[r] += b.data.granary.resource_stored[r];
+        if (pct_workers < 50) {
+            city_data.resource.granaries.not_operating++;
+            if (amount_stored > 0)
+                city_data.resource.granaries.not_operating_with_food++;
 
-                if (amount_stored >= 100)
-                    tutorial_on_filled_granary(amount_stored);
-            }
+        } else {
+            city_data.resource.granaries.operating++;
+            for (int r = 0; r < RESOURCES_FOODS_MAX; r++)
+                city_data.resource.granary_food_stored[r] += granary.resource_stored[r];
+
+            if (amount_stored >= 100)
+                tutorial_on_filled_granary(amount_stored);
         }
     }, BUILDING_GRANARY);