city: moved fire/collapse logic to city_maintenance class

Author: dalerank

src/building/building.cpp

@@ -39,6 +39,8 @@
 #include "core/object_property.h"
 #include "graphics/view/view.h"
 #include "config/config.h"
+#include "core/random.h"
+#include "sound/sound.h"
 
 #include <string.h>
 #include <map>
@@ -52,7 +54,7 @@ void game_cheat_destroy_type(std::istream &is, std::ostream &os) {
     int type = atoi(args.empty() ? (pcstr)"0" : args.c_str());
 
     buildings_valid_do([] (building &b) {
-        building_destroy_by_collapse(&b);
+        b.destroy_by_collapse();
     }, (e_building_type)type);
 };
 
@@ -231,12 +233,18 @@ building::building() {
 }
 
 building* building::main() {
+    if (prev_part_building_id <= 0) {
+        return this;
+    }
+
     building* b = this;
     for (int guard = 0; guard < 99; guard++) {
-        if (b->prev_part_building_id <= 0)
+        if (b->prev_part_building_id <= 0) {
             return b;
+        }
         b = building_get(b->prev_part_building_id);
     }
+
     return building_get(0);
 }
 
@@ -506,10 +514,95 @@ bool building::workshop_has_resources() {
     return has_second_material && hase_first_resource;
 }
 
+void building::destroy_by_collapse() {
+    assert(is_main());
+    state = BUILDING_STATE_RUBBLE;
+    map_building_tiles_set_rubble(id, tile, size);
+    figure_create_explosion_cloud(tile, size);
+    destroy_linked_parts(false);
+    g_sound.play_effect(SOUND_EFFECT_EXPLOSION);
+}
+
+void building::destroy_on_fire_impl(bool plagued) {
+    game_undo_disable();
+    fire_risk = 0;
+    damage_risk = 0;
+
+    //int was_tent = b->house_size && b->data.house.level <= HOUSE_STURDY_HUT;
+    state = BUILDING_STATE_DELETED_BY_GAME;
+    output_resource_first_id = RESOURCE_NONE;
+    output_resource_second_id = RESOURCE_NONE;
+    distance_from_entry = 0;
+    clear_related_data();
+
+    int waterside_building = 0;
+    if (type == BUILDING_DOCK || type == BUILDING_FISHING_WHARF || type == BUILDING_SHIPWRIGHT) {
+        waterside_building = 1;
+    }
+
+    map_building_tiles_remove(id, tile);
+    unsigned int rand_int = random_short();
+
+    grid_area varea = map_grid_get_area(tile, size, 0);
+    map_grid_area_foreach(varea, [plagued] (tile2i tile) {
+        if (map_terrain_is(tile, TERRAIN_WATER)) {
+            return;
+        }
+
+        // FIXME: possible can't render image & fire animation
+        building *ruin = building_create(BUILDING_BURNING_RUIN, tile, 0);
+        ruin->has_plague = plagued;
+    });
+
+    if (waterside_building) {
+        map_routing_update_water();
+    }
+}
+
+void building::destroy_by_fire() {
+    assert(is_main());
+    destroy_on_fire_impl(false);
+    destroy_linked_parts(true);
+    g_sound.play_effect(SOUND_EFFECT_EXPLOSION);
+}
+
+void building::destroy_linked_parts(bool on_fire) {
+    building *part = this;
+    for (int i = 0; i < 99; i++) {
+        if (part->prev_part_building_id <= 0) {
+            break;
+        }
+
+        int part_id = part->prev_part_building_id;
+        part = building_get(part_id);
+        if (on_fire) {
+            part->destroy_on_fire_impl(false);
+        } else {
+            map_building_tiles_set_rubble(part_id, part->tile, part->size);
+            part->state = BUILDING_STATE_RUBBLE;
+        }
+    }
+
+    part = this;
+    for (int i = 0; i < 99; i++) {
+        part = part->next();
+        if (part->id <= 0) {
+            break;
+        }
+
+        if (on_fire) {
+            part->destroy_on_fire_impl(false);
+        } else {
+            map_building_tiles_set_rubble(part->id, part->tile, part->size);
+            part->state = BUILDING_STATE_RUBBLE;
+        }
+    }
+}
+
 void building::mark_plague(int days) {
-    auto m = main();
-    m->disease_days = days;
-    m->has_plague = true;
+    assert(is_main());
+    disease_days = days;
+    has_plague = true;
 }
 
 pcstr building::cls_name() const {

src/building/building.h

@@ -294,6 +294,9 @@ class building {
     bool common_spawn_goods_output_cartpusher(bool only_one = true, bool only_full_loads = true, int min_carry = 100, int max_carry = 800);
     bool workshop_has_resources();
 
+    void destroy_by_collapse();
+    void destroy_by_fire();
+
     void mark_plague(int days);
 
 public:
@@ -368,6 +371,10 @@ class building {
         _ptr = (building_impl *)&_ptr_buffer;
         return _ptr;
     }
+
+private:
+    void destroy_on_fire_impl(bool plagued);
+    void destroy_linked_parts(bool on_fire);
 };
 
 #define BUILDING_METAINFO(type, clsid) static constexpr e_building_type TYPE = type; static constexpr pcstr CLSID = #clsid;

src/building/building_architect_post.cpp

@@ -46,7 +46,7 @@ void console_command_collapse(std::istream &is, std::ostream &) {
 
     int step = std::max<int>(1, (int)buildings.size() / count);
     for (int i = 0; i < buildings.size(); i += step) {
-        building_destroy_by_collapse(buildings[i]);
+        buildings[i]->destroy_by_collapse();
     }
 }
 

src/building/building_burning_ruin.cpp

@@ -142,7 +142,7 @@ bool building_burning_ruin::update() {
         int grid_offset = tile().grid_offset();
         int next_building_id = map_building_at(grid_offset + map_grid_direction_delta(dir));
         if (next_building_id && !building_get(next_building_id)->fire_proof) {
-            building_destroy_by_fire(building_get(next_building_id));
+            building_get(next_building_id)->destroy_by_fire();
             return true;
         }
     }

src/building/building_debug_properties.cpp

@@ -16,7 +16,7 @@ void game_debug_show_properties_object(pcstr prefix, building *b) {
     ImGui::TableSetColumnIndex(1); 
 
     if (common_open) {
-        game_debug_show_property("Untype/Destroy", [b] { building_destroy_by_collapse(b); });
+        game_debug_show_property("Untype/Destroy", [b] { b->destroy_by_collapse(); });
         game_debug_show_property("id", b->id, true);
         game_debug_show_property("state", token::find_name(e_building_state_tokens, b->state));
         game_debug_show_property("size", b->size);

src/building/building_firehouse.cpp

@@ -34,7 +34,7 @@ void console_command_startfire(std::istream &is, std::ostream &) {
 
     int step = std::max<int>(1, (int)buildings.size() / count);
     for (int i = 0; i < buildings.size(); i += step) {
-        building_destroy_by_fire(buildings[i]);
+        buildings[i]->main()->destroy_by_fire();
     }
 }
 

src/building/building_granary.cpp

@@ -450,7 +450,7 @@ void building_granary_storageyard_curse(int big) {
     if (big) {
         city_message_disable_sound_for_next_message();
         city_message_post(false, MESSAGE_FIRE, max_building->type, max_building->tile.grid_offset());
-        building_destroy_by_fire(max_building);
+        max_building->destroy_by_fire();
         map_routing_update_land();
     } else {
         if (max_building->type == BUILDING_STORAGE_YARD) {

src/building/building_house.cpp

@@ -955,7 +955,15 @@ void building_house::on_create(int orientation) {
     }
 }
 
-void building_house::on_place_checks() {       
+void building_house::on_destroy() {
+    g_city.population.remove_home_removed(house_population());
+
+    auto &d = runtime_data();
+    d.population = 0;
+    d.hsize = 0;
+}
+
+void building_house::on_place_checks() {
     if (type() != BUILDING_HOUSE_VACANT_LOT) {
         return;
     }

src/building/building_house.h

@@ -77,6 +77,7 @@ class building_house : public building_impl {
 
     virtual void on_create(int orientation) override;
     //virtual void on_place(int orientation, int variant) override;
+    virtual void on_destroy() override;
     virtual void on_place_checks() override;
     virtual e_sound_channel_city sound_channel() const override { return SOUND_CHANNEL_CITY_STATUE; }
     virtual void on_undo() override;

src/building/destruction.cpp

@@ -21,94 +21,6 @@
 #include <core/random.h>
 #include <string.h>
 
-static void destroy_on_fire(building* b, bool plagued) {
-    game_undo_disable();
-    b->fire_risk = 0;
-    b->damage_risk = 0;
-
-    auto house = b->dcast_house();
-    if (house) {
-        auto &housed = house->runtime_data();
-        if (housed.population > 0) {
-            g_city.population.remove_home_removed(housed.population);
-            housed.population = 0;
-            housed.hsize = 0;
-        }
-    }
-
-    //int was_tent = b->house_size && b->data.house.level <= HOUSE_STURDY_HUT;
-    b->state = BUILDING_STATE_DELETED_BY_GAME;
-    b->output_resource_first_id = RESOURCE_NONE;
-    b->output_resource_second_id = RESOURCE_NONE;
-    b->distance_from_entry = 0;
-    b->clear_related_data();
-
-    int waterside_building = 0;
-    if (b->type == BUILDING_DOCK || b->type == BUILDING_FISHING_WHARF || b->type == BUILDING_SHIPWRIGHT) {
-        waterside_building = 1;
-    }
-
-    map_building_tiles_remove(b->id, b->tile);
-    unsigned int rand_int = random_short();
-
-    grid_area varea = map_grid_get_area(b->tile, b->size, 0);
-    map_grid_area_foreach(varea, [plagued] (tile2i tile) {
-        if (map_terrain_is(tile, TERRAIN_WATER)) {
-            return;
-        }
-
-        // FIXME: possible can't render image & fire animation
-        building *ruin = building_create(BUILDING_BURNING_RUIN, tile, 0);
-        ruin->has_plague = plagued;
-    });
-
-    if (waterside_building) {
-        map_routing_update_water();
-    }
-}
-
-static void destroy_linked_parts(building* b, bool on_fire) {
-    building* part = b;
-    for (int i = 0; i < 99; i++) {
-        if (part->prev_part_building_id <= 0) {
-            break;
-        }
-
-        int part_id = part->prev_part_building_id;
-        part = building_get(part_id);
-        if (on_fire) {
-            destroy_on_fire(part, false);
-        } else {
-            map_building_tiles_set_rubble(part_id, part->tile, part->size);
-            part->state = BUILDING_STATE_RUBBLE;
-        }
-    }
-
-    part = b;
-    for (int i = 0; i < 99; i++) {
-        part = part->next();
-        if (part->id <= 0) {
-            break;
-        }
-
-        if (on_fire) {
-            destroy_on_fire(part, false);
-        } else {
-            map_building_tiles_set_rubble(part->id, part->tile, part->size);
-            part->state = BUILDING_STATE_RUBBLE;
-        }
-    }
-}
-
-void building_destroy_by_collapse(building* b) {
-    b = b->main();
-    b->state = BUILDING_STATE_RUBBLE;
-    map_building_tiles_set_rubble(b->id, b->tile, b->size);
-    figure_create_explosion_cloud(b->tile, b->size);
-    destroy_linked_parts(b, false);
-    g_sound.play_effect(SOUND_EFFECT_EXPLOSION);
-}
-
 void building_destroy_by_poof(building* b, bool clouds) {
     b = b->main();
     if (clouds) {
@@ -127,16 +39,9 @@ void building_destroy_by_poof(building* b, bool clouds) {
     } while (true);
 }
 
-void building_destroy_by_fire(building* b) {
-    b = b->main();
-    destroy_on_fire(b, false);
-    destroy_linked_parts(b, true);
-    g_sound.play_effect(SOUND_EFFECT_EXPLOSION);
-}
-
 void building_destroy_by_rioter(building* b) {
     b = b->main();
-    destroy_on_fire(b, false);
+    b->destroy_by_fire();
 }
 
 int building_destroy_first_of_type(e_building_type type) {
@@ -186,7 +91,7 @@ void building_destroy_by_enemy(tile2i tile) {
         building* b = building_get(building_id);
         if (b->state == BUILDING_STATE_VALID) {
             g_city.ratings.monument_building_destroyed(b->type);
-            building_destroy_by_collapse(b);
+            b->destroy_by_collapse();
         }
     } else {
         if (map_terrain_is(tile, TERRAIN_WALL)) {