buildings: moved apothecary code to own class from common

Author: s.kushnirenko

src/building/building.cpp

@@ -14,6 +14,7 @@
 #include "building/building_bandstand.h"
 #include "building/building_bricklayers_guild.h"
 #include "building/building_booth.h"
+#include "building/building_health.h"
 #include "city/buildings.h"
 #include "city/population.h"
 #include "city/warning.h"
@@ -330,6 +331,7 @@ building_impl *building::dcast() {
     case BUILDING_ARCHITECT_POST: _ptr = new building_architect_post(*this); break;
     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_SMALL_MASTABA:
     case BUILDING_SMALL_MASTABA_SIDE:

src/building/building.h

@@ -328,7 +328,6 @@ class building {
     void set_water_supply_graphic();
     void spawn_figure_school();
     void spawn_figure_library();
-    void spawn_figure_apothecary();
     void spawn_figure_dentist();
     void spawn_figure_mortuary();
     void spawn_figure_physician();
@@ -392,6 +391,7 @@ class building_impl {
     inline bool is_main() { return base.is_main(); }
     inline figure *create_roaming_figure(e_figure_type _type, e_figure_action created_action, e_building_slot slot) { return base.create_roaming_figure(_type, created_action, slot); }
     inline bool common_spawn_figure_trigger(int min_houses) { return base.common_spawn_figure_trigger(min_houses); }
+    inline bool common_spawn_roamer(e_figure_type type, int min_houses, e_figure_action created_action) { return base.common_spawn_roamer(type, min_houses, created_action); }
 
     building &base;
     building::impl_data_t &data;

src/building/building_architect_post.cpp

@@ -48,6 +48,6 @@ void building_architect_post::window_info_background(object_info &c) {
 }
 
 void building_architect_post::spawn_figure() {
-    base.common_spawn_roamer(FIGURE_ARCHITECT, 50, FIGURE_ACTION_60_ENGINEER_CREATED);
+    common_spawn_roamer(FIGURE_ARCHITECT, 50, FIGURE_ACTION_60_ENGINEER_CREATED);
 }
 

src/building/building_health.cpp

@@ -1,6 +1,7 @@
 #include "building_health.h"
 
 #include "building/building.h"
+#include "building/figure.h"
 #include "city/object_info.h"
 #include "game/resource.h"
 #include "graphics/elements/panel.h"
@@ -34,7 +35,7 @@ static void building_health_draw_info(object_info& c, int help_id, const char* t
     window_building_draw_employment(&c, 142);
 }
 
-void building_apothecary_draw_info(object_info& c) {
+void building_apothecary::window_info_background(object_info& c) {
     building_health_draw_info(c, 63, "apothecary", e_text_building_apothecary, FIGURE_HERBALIST);
 }
 
@@ -69,3 +70,22 @@ void building_physician_draw_info(object_info& c) {
     inner_panel_draw(c.offset.x + 16, c.offset.y + 136, c.width_blocks - 2, 4);
     window_building_draw_employment(&c, 142);
 }
+
+void building_apothecary::spawn_figure() {
+    common_spawn_roamer(FIGURE_HERBALIST, 50, FIGURE_ACTION_125_ROAMING);
+    //    check_labor_problem();
+    //    if (has_figure_of_type(FIGURE_DOCTOR))
+    //        return;
+    //    map_point road;
+    //    if (map_has_road_access(x, y, size, &road)) {
+    //        spawn_labor_seeker(50);
+    //        int spawn_delay = figure_spawn_timer();
+    //        if (spawn_delay == -1)
+    //            return;
+    //        figure_spawn_delay++;
+    //        if (figure_spawn_delay > spawn_delay) {
+    //            figure_spawn_delay = 0;
+    //            create_roaming_figure(road.x, road.y, FIGURE_DOCTOR);
+    //        }
+    //    }
+}

src/building/building_health.h

@@ -1,8 +1,14 @@
 #pragma once
 
-struct object_info;
+#include "building/building.h"
+
+class building_apothecary : public building_impl {
+public:
+    building_apothecary(building &b) : building_impl(b) {}
+    virtual void window_info_background(object_info &c) override;
+    virtual void spawn_figure() override;
+};
 
-void building_apothecary_draw_info(object_info& c);
 void building_dentist_draw_info(object_info& c);
 void building_mortuary_draw_info(object_info& c);
 void building_physician_draw_info(object_info& c);

src/building/figure.cpp

@@ -543,24 +543,7 @@ void building::spawn_figure_mortuary() {
     //        }
     //    }
 }
-void building::spawn_figure_apothecary() {
-    common_spawn_roamer(FIGURE_HERBALIST, 50);
-    //    check_labor_problem();
-    //    if (has_figure_of_type(FIGURE_DOCTOR))
-    //        return;
-    //    map_point road;
-    //    if (map_has_road_access(x, y, size, &road)) {
-    //        spawn_labor_seeker(50);
-    //        int spawn_delay = figure_spawn_timer();
-    //        if (spawn_delay == -1)
-    //            return;
-    //        figure_spawn_delay++;
-    //        if (figure_spawn_delay > spawn_delay) {
-    //            figure_spawn_delay = 0;
-    //            create_roaming_figure(road.x, road.y, FIGURE_DOCTOR);
-    //        }
-    //    }
-}
+
 void building::spawn_figure_dentist() {
     common_spawn_roamer(FIGURE_DENTIST, 50);
 }
@@ -1274,7 +1257,6 @@ bool building::figure_generate() {
         case BUILDING_SCRIBAL_SCHOOL: spawn_figure_school(); break;
         case BUILDING_LIBRARY: spawn_figure_library(); break;
         case BUILDING_WATER_LIFT: common_spawn_figure_trigger(50); break;
-        case BUILDING_APOTHECARY: spawn_figure_apothecary(); break;
         case BUILDING_DENTIST: spawn_figure_dentist(); break;
         case BUILDING_MORTUARY: spawn_figure_mortuary(); break;
         case BUILDING_PHYSICIAN: spawn_figure_physician(); break;

src/building/properties.cpp

@@ -52,7 +52,7 @@ static building_properties properties[400] = {
     {3, 1, 0, 0},                      // statues ^^^
     {3, 1, GROUP_BUILDING_FORT},       // archers
     {3, 1, GROUP_BUILDING_FORT},       // infantry
-    {1, 0, GROUP_BUILDING_APOTHECARY}, // apothecary
+    {1, 0, 0, 0}, // apothecary
     {2, 0, GROUP_BUILDING_MORTUARY},   // mortuary
     {2, 0, 0, 0},
     {1, 0, GROUP_BUILDING_DENTIST},        // dentist
@@ -264,6 +264,7 @@ void building_properties_init() {
     properties[BUILDING_BAZAAR] = {2, 0, 0, 0, 0, IMG_BAZAAR};
     properties[BUILDING_BRICKLAYERS_GUILD] = {2, 0, 0, 0, 0, IMG_BRICKLAYERS_GUILD};
     properties[BUILDING_FIREHOUSE] = {1, 0, 0, 0, 0, IMG_BUILDING_FIREHOUSE};
+    properties[BUILDING_APOTHECARY] = {1, 0, 0, 0, 0, IMG_BUILDING_APOTHECARY};
 }
 
 const building_properties* building_properties_for_type(e_building_type type) {

src/graphics/image_groups.h

@@ -132,7 +132,7 @@ enum e_pack {
 #define GROUP_BUILDING_TIMBER_YARD PACK_GENERAL, 65
 #define GROUP_BUILDING_FORT PACK_GENERAL, 66
 #define GROUP_BUILDING_DENTIST PACK_GENERAL, 67
-#define GROUP_BUILDING_APOTHECARY PACK_GENERAL, 68
+//#define GROUP_BUILDING_APOTHECARY PACK_GENERAL, 68
 //#define GROUP_BUILDING_WATER_SUPPLY PACK_GENERAL, 69
 //#define GROUP_BUILDING_PHYSICIAN PACK_GENERAL, 70
 #define GROUP_BUILDING_MORTUARY PACK_GENERAL, 175     // 70

src/graphics/indexes.h

@@ -126,3 +126,4 @@ REGISTER_IMG(IMG_BIGSLED_CLAY, 125)
 REGISTER_IMG(IMG_BIGSLED_BRICKS, 126)
 REGISTER_IMG(IMG_SMALL_MASTABA_BRICKS, 127)
 REGISTER_IMG(IMG_BUILDING_FIREHOUSE, 128)
+REGISTER_IMG(IMG_BUILDING_APOTHECARY, 128)

src/scripts/images.js

@@ -147,6 +147,7 @@ images = [
 	{img: IMG_BIGSLED_BRICKS, pack:PACK_SPR_MAIN, id:172},
 	{img: IMG_SMALL_MASTABA_BRICKS, pack:PACK_MASTABA, id:1, offset:0},
 	{img: IMG_BUILDING_FIREHOUSE, pack:PACK_GENERAL, id:78},
+	{img: IMG_BUILDING_APOTHECARY, pack:PACK_GENERAL, id:68},
 ]
 
 cart_offsets = [

src/window/window_building_info.cpp

@@ -656,7 +656,6 @@ static void draw_refresh_background() {
             case BUILDING_DANCE_SCHOOL: building_dancer_school_draw_info(context); break;
             case BUILDING_JUGGLER_SCHOOL: building_juggler_school_draw_info(context); break;
             case BUILDING_SENET_MASTER: building_bullfight_school_draw_info(context); break;
-            case BUILDING_APOTHECARY: building_apothecary_draw_info(context); break;
             case BUILDING_MORTUARY: building_mortuary_draw_info(context); break;
             case BUILDING_PHYSICIAN: building_physician_draw_info(context); break;
             case BUILDING_DENTIST: building_dentist_draw_info(context); break;