building: restored logic for brewery

Author: s.kushnirenko

src/building/building.cpp

@@ -10,6 +10,7 @@
 #include "building/building_firehouse.h"
 #include "building_architect_post.h"
 #include "building/storage_yard.h"
+#include "building/building_brewery.h"
 #include "building/monument_mastaba.h"
 #include "building/building_bandstand.h"
 #include "building/building_bricklayers_guild.h"
@@ -169,10 +170,6 @@ static void building_new_fill_in_data_for_type(building* b, e_building_type type
     case BUILDING_CLAY_PIT:
         b->output_resource_first_id = RESOURCE_CLAY;
         break;
-    case BUILDING_BREWERY_WORKSHOP:
-        b->data.industry.first_material_id = RESOURCE_BARLEY;
-        b->output_resource_first_id = RESOURCE_BEER;
-        break;
     case BUILDING_WEAVER_WORKSHOP:
         b->data.industry.first_material_id = RESOURCE_FLAX;
         b->output_resource_first_id = RESOURCE_LINEN;
@@ -334,6 +331,7 @@ building_impl *building::dcast() {
     case BUILDING_APOTHECARY: _ptr = new building_apothecary(*this); break;
     case BUILDING_POTTERY_WORKSHOP: _ptr = new building_pottery(*this); break;
     case BUILDING_WELL: _ptr = new building_well(*this); break;
+    case BUILDING_BREWERY_WORKSHOP: _ptr = new building_brewery(*this); break;
 
     case BUILDING_SHRINE_OSIRIS:
     case BUILDING_SHRINE_RA:

src/building/building.h

@@ -402,6 +402,11 @@ class building_impl {
     inline tile2i tile() const { return base.tile; }
     inline e_building_type type() const { return base.type; }
 
+    virtual bool is_workshop() const { return false; }
+
+    using resources_vec = std::array<e_resource, 4>;
+    virtual resources_vec required_resource() const { return {}; }
+
     building &base;
     building::impl_data_t &data;
 };

src/building/building_brewery.cpp

@@ -0,0 +1,15 @@
+#include "building/building_brewery.h"
+
+#include "building/building_workshop.h"
+
+void building_brewery::on_create() {
+    data.industry.first_material_id = RESOURCE_BARLEY;
+    base.output_resource_first_id = RESOURCE_BEER;
+}
+
+void building_brewery::window_info_background(object_info& c) {
+    e_resource input_resource = RESOURCE_BARLEY;
+    e_resource output_resource = RESOURCE_BEER;
+
+    building_workshop_draw_info(c, 96, "brewery", 122, output_resource, input_resource);
+}

src/building/building_brewery.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "building/building.h"
+
+class building_brewery : public building_impl {
+public:
+    building_brewery(building &b) : building_impl(b) {}
+    virtual void on_create() override;
+    virtual bool is_workshop() const override { return true; }
+    virtual void window_info_background(object_info &c) override;
+
+    virtual resources_vec required_resource() const override { return {RESOURCE_BARLEY}; }
+};

src/building/building_workshop.cpp

@@ -122,13 +122,6 @@ static void building_workshop_draw_info(object_info& c, int help_id, const char*
     window_building_draw_employment(&c, y_offset + 48);
 }
 
-void building_brewery_draw_info(object_info& c) {
-    e_resource input_resource = RESOURCE_BARLEY;
-    e_resource output_resource = RESOURCE_BEER;
-
-    building_workshop_draw_info(c, 96, "brewery", 122, output_resource, input_resource);
-}
-
 void building_flax_workshop_draw_info(object_info& c) {
     e_resource input_resource = RESOURCE_FLAX;
     e_resource output_resource = RESOURCE_LINEN;

src/building/building_workshop.h

@@ -6,7 +6,6 @@
 struct object_info;
 struct painter;
 
-void building_brewery_draw_info(object_info& c);
 void building_flax_workshop_draw_info(object_info& c);
 void building_weapons_workshop_draw_info(object_info& c);
 void building_luxury_workshop_draw_info(object_info& c);

src/window/window_building_info.cpp

@@ -553,7 +553,6 @@ static void draw_refresh_background() {
             case BUILDING_COPPER_MINE: building_copper_mine_draw_info(context); break;
             case BUILDING_SANDSTONE_QUARRY: building_sandstone_quarry_draw_info(context); break;
             case BUILDING_GRANITE_QUARRY: building_granite_quarry_draw_info(context); break;;
-            case BUILDING_BREWERY_WORKSHOP: building_brewery_draw_info(context); break;
             case BUILDING_WEAVER_WORKSHOP: building_flax_workshop_draw_info(context); break;
             case BUILDING_WEAPONS_WORKSHOP: building_weapons_workshop_draw_info(context); break;
             case BUILDING_JEWELS_WORKSHOP: building_luxury_workshop_draw_info(context); break;