feat add support for building_mansion

what:
 + remove unused function window_building_draw_governor_home
 + remove mansion building types from building_type_to_channel

Author: s.kushnirenko

src/building/building.cpp

@@ -18,6 +18,7 @@
 #include "building/building_pottery.h"
 #include "building/building_well.h"
 #include "building/building_shrine.h"
+#include "building/building_mansion.h"
 #include "city/buildings.h"
 #include "city/population.h"
 #include "city/warning.h"
@@ -341,6 +342,12 @@ building_impl *building::dcast() {
     case BUILDING_SHRINE_BAST:
         _ptr = new building_shrine(*this); 
         break;
+
+    case BUILDING_PERSONAL_MANSION:
+    case BUILDING_FAMILY_MANSION:
+    case BUILDING_DYNASTY_MANSION:
+        _ptr = new building_mansion(*this);
+        break;
 
     case BUILDING_SMALL_MASTABA:
     case BUILDING_SMALL_MASTABA_SIDE:

src/building/building.h

@@ -10,6 +10,7 @@
 #include "figure/figure_type.h"
 #include "game/resource.h"
 #include "grid/point.h"
+#include "sound/city.h"
 
 #include <stdint.h>
 #include <algorithm>
@@ -390,6 +391,7 @@ class building_impl {
     virtual bool draw_ornaments_and_animations_height(vec2i point, tile2i tile, painter &ctx);
     virtual e_overlay get_overlay() const { return OVERLAY_NONE; }
     virtual bool need_road_access() const { return true; }
+    virtual e_sound_channel_city sound_channel() const { return SOUND_CHANNEL_CITY_NONE; }
 
     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); }
@@ -398,7 +400,6 @@ class building_impl {
     inline tile2i tile() const { return base.tile; }
     inline e_building_type type() const { return base.type; }
 
-
     building &base;
     building::impl_data_t &data;
 };

src/building/building_mansion.cpp

@@ -0,0 +1,13 @@
+#include "building_mansion.h"
+
+#include "window/building/common.h"
+#include "graphics/elements/panel.h"
+#include "graphics/elements/lang_text.h"
+
+void building_mansion::window_info_background(object_info &c) {
+    c.help_id = 78;
+    window_building_play_sound(&c, "wavs/gov_palace.wav");
+    outer_panel_draw(c.offset, c.width_blocks, c.height_blocks);
+    lang_text_draw_centered(103, 0, c.offset.x, c.offset.y + 10, 16 * c.width_blocks, FONT_LARGE_BLACK_ON_LIGHT);
+    window_building_draw_description_at(c, 16 * c.height_blocks - 143, 103, 1);
+}

src/building/building_mansion.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "building/building.h"
+
+class building_mansion : public building_impl {
+public:
+    building_mansion(building &b) : building_impl(b) {}
+    virtual void window_info_background(object_info &ctx) override;
+    virtual e_sound_channel_city sound_channel() const override { return SOUND_CHANNEL_CITY_MANSION; }
+};

src/sound/city.cpp

@@ -126,11 +126,6 @@ int building_type_to_channel(building *b) {
 
     case BUILDING_FISHING_WHARF: return SOUND_CHANNEL_CITY_WHARF;
 
-    case BUILDING_PERSONAL_MANSION:
-    case BUILDING_FAMILY_MANSION:
-    case BUILDING_DYNASTY_MANSION:
-        return SOUND_CHANNEL_CITY_MANSION;
-
     case BUILDING_ARCHITECT_POST: return SOUND_CHANNEL_CITY_ENGINEERS_POST;
 
     case BUILDING_LOW_BRIDGE:
@@ -168,7 +163,7 @@ int building_type_to_channel(building *b) {
     case BUILDING_HUNTING_LODGE: return  SOUND_CHANNEL_CITY_HUNTER_LOUDGE;
     }
 
-    return 0;
+    return b->dcast()->sound_channel();
 }
 
 void sound_city_mark_terrain_view(int terrain, int grid_offset, int direction) {

src/sound/city.h

@@ -14,6 +14,7 @@ enum e_sound_dir {
 };
 
 enum e_sound_channel_city {
+    SOUND_CHANNEL_CITY_NONE = 0,
     SOUND_CHANNEL_CITY_START = SOUND_CHANNEL_CITY_MIN,
     SOUND_CHANNEL_CITY_HOUSE_SLUM = SOUND_CHANNEL_CITY_MIN,
     SOUND_CHANNEL_CITY_HOUSE_POOR,

src/window/building/government.cpp

@@ -10,14 +10,6 @@
 #include "window/building/figures.h"
 #include "window/building/common.h"
 
-void window_building_draw_governor_home(object_info* c) {
-    c->help_id = 78;
-    window_building_play_sound(c, "wavs/gov_palace.wav");
-    outer_panel_draw(c->offset, c->width_blocks, c->height_blocks);
-    lang_text_draw_centered(103, 0, c->offset.x, c->offset.y + 10, 16 * c->width_blocks, FONT_LARGE_BLACK_ON_LIGHT);
-    window_building_draw_description_at(c, 16 * c->height_blocks - 143, 103, 1);
-}
-
 void window_building_draw_triumphal_arch(object_info* c) {
     c->help_id = 79;
     window_building_play_sound(c, "wavs/statue.wav");

src/window/building/government.h

@@ -2,6 +2,5 @@
 
 struct object_info;
 
-void window_building_draw_governor_home(object_info* c);
 void window_building_draw_triumphal_arch(object_info* c);
 void window_building_draw_courthouse(object_info* c);

src/window/window_building_info.cpp

@@ -687,12 +687,8 @@ static void draw_refresh_background() {
                 building_temple_bast_draw_info(context);
                 break;
 
-            case BUILDING_ORACLE: window_building_draw_oracle(&context); break;
-
-            case BUILDING_PERSONAL_MANSION:
-            case BUILDING_FAMILY_MANSION:
-            case BUILDING_DYNASTY_MANSION:
-                window_building_draw_governor_home(&context);
+            case BUILDING_ORACLE:
+                window_building_draw_oracle(&context);
                 break;
 
             case BUILDING_TAX_COLLECTOR: