building: moved pottery workshop from common to own file

Author: s.kushnirenko

src/building/building.cpp

@@ -15,6 +15,7 @@
 #include "building/building_bricklayers_guild.h"
 #include "building/building_booth.h"
 #include "building/building_health.h"
+#include "building/building_pottery.h"
 #include "city/buildings.h"
 #include "city/population.h"
 #include "city/warning.h"
@@ -181,10 +182,6 @@ static void building_new_fill_in_data_for_type(building* b, e_building_type type
         b->data.industry.first_material_id = RESOURCE_GEMS;
         b->output_resource_first_id = RESOURCE_LUXURY_GOODS;
         break;
-    case BUILDING_POTTERY_WORKSHOP:
-        b->data.industry.first_material_id = RESOURCE_CLAY;
-        b->output_resource_first_id = RESOURCE_POTTERY;
-        break;
     case BUILDING_HUNTING_LODGE:
         b->output_resource_first_id = RESOURCE_GAMEMEAT;
         break;
@@ -332,6 +329,7 @@ building_impl *building::dcast() {
     case BUILDING_BANDSTAND: _ptr = new building_bandstand(*this); break;
     case BUILDING_BOOTH: _ptr = new building_booth(*this); break;
     case BUILDING_APOTHECARY: _ptr = new building_apothecary(*this); break;
+    case BUILDING_POTTERY_WORKSHOP: _ptr = new building_pottery(*this); break;
 
     case BUILDING_SMALL_MASTABA:
     case BUILDING_SMALL_MASTABA_SIDE:

src/building/building_pottery.cpp

@@ -0,0 +1,14 @@
+#include "building/building_pottery.h"
+
+#include "building/building_workshop.h"
+
+void building_pottery::on_create() {
+    data.industry.first_material_id = RESOURCE_CLAY;
+    base.output_resource_first_id = RESOURCE_POTTERY;
+}
+
+void building_pottery::window_info_background(object_info& c) {
+    e_resource output_resource = RESOURCE_POTTERY;
+
+    building_workshop_draw_info(c, 1, "pottery_workshop", 126, output_resource, RESOURCE_CLAY);
+}

src/building/building_pottery.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "building/building.h"
+
+class building_pottery : public building_impl {
+public:
+    building_pottery(building &b) : building_impl(b) {}
+    virtual void on_create() override;
+    virtual void window_info_background(object_info &c) override;
+};

src/building/building_workshop.cpp

@@ -16,7 +16,7 @@
 #include "sound/sound_building.h"
 #include "game/game.h"
 
-static void building_workshop_draw_info(object_info& c, int help_id, const char* type, int group_id, e_resource resource, e_resource input_resource) {
+void building_workshop_draw_info(object_info& c, int help_id, pcstr type, int group_id, e_resource resource, e_resource input_resource) {
     c.help_id = help_id;
     window_building_play_sound(&c, snd::get_building_info_sound(type));
 
@@ -148,12 +148,6 @@ void building_luxury_workshop_draw_info(object_info& c) {
     building_workshop_draw_info(c, 99, "luxury_workshop", 125, output_resource, input_resource);
 }
 
-void building_pottery_workshop_draw_info(object_info& c) {
-    e_resource output_resource = RESOURCE_POTTERY;
-
-    building_workshop_draw_info(c, 1, "pottery_workshop", 126, output_resource, RESOURCE_CLAY);
-}
-
 void building_papyrus_workshop_draw_info(object_info& c) {
     e_resource output_resource = RESOURCE_PAPYRUS;
 

src/building/building_workshop.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "graphics/color.h"
+#include "game/resource.h"
 
 struct object_info;
 struct painter;
@@ -9,8 +10,8 @@ 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);
-void building_pottery_workshop_draw_info(object_info& c);
 void building_brick_maker_workshop_draw_info(object_info& c);
 void building_papyrus_workshop_draw_info(object_info &c);
 void building_cattle_ranch_draw_info(object_info &c);
+void building_workshop_draw_info(object_info &c, int help_id, pcstr type, int group_id, e_resource resource, e_resource input_resource);
 void building_workshop_draw_raw_material_storage(painter &ctx, const building *b, vec2i pos, color color_mask);

src/window/window_building_info.cpp

@@ -631,7 +631,6 @@ static void draw_refresh_background() {
             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;
-            case BUILDING_POTTERY_WORKSHOP: building_pottery_workshop_draw_info(context); break;
             case BUILDING_PAPYRUS_WORKSHOP: building_papyrus_workshop_draw_info(context); break;
             case BUILDING_CATTLE_RANCH: building_cattle_ranch_draw_info(context); break;
             case BUILDING_BRICKS_WORKSHOP: building_brick_maker_workshop_draw_info(context); break;