tutorial: collapse handler moved to event

Author: dalerank

src/building/maintenance.cpp

@@ -98,16 +98,17 @@ std::pair<int, tile2i> building_maintenance_get_closest_burning_ruin(tile2i tile
 
 static void collapse_building(building* b) {
     city_message_apply_sound_interval(MESSAGE_CAT_COLLAPSE);
-    if (!tutorial_handle_collapse()) {
-        city_message_post_with_popup_delay(MESSAGE_CAT_COLLAPSE, false, MESSAGE_COLLAPSED_BUILDING, b->type, b->tile.grid_offset());
-    }
+
+    g_city_events.enqueue(event_collase_damage{ b->id });
+    city_message_post_with_popup_delay(MESSAGE_CAT_COLLAPSE, false, MESSAGE_COLLAPSED_BUILDING, b->type, b->tile.grid_offset());
 
     game_undo_disable();
     building_destroy_by_collapse(b);
 }
 
 static void fire_building(building* b) {
     city_message_apply_sound_interval(MESSAGE_CAT_FIRE);
+    city_message_post_with_popup_delay(MESSAGE_CAT_FIRE, false, MESSAGE_FIRE, b->type, b->tile.grid_offset());
 
     g_city_events.enqueue(event_fire_damage{ b->id });
 
@@ -172,6 +173,7 @@ void building_maintenance_check_fire_collapse() {
 }
 
 void building_maintenance_init() {
+   
 }
 
 void building_maintenance_check_kingdome_access() {

src/building/maintenance.h

@@ -6,6 +6,7 @@
 #include <functional>
 
 struct event_fire_damage { building_id bid; };
+struct event_collase_damage { building_id id; };
 
 void building_maintenance_update_fire_direction();
 int building_maintenance_fire_direction();

src/game/tutorial.cpp

@@ -193,6 +193,18 @@ void tutorial1_handle_population_changed(event_population_changed ev) {
     post_message(MESSAGE_TUTORIAL_FOOD_OR_FAMINE);
 }
 
+void tutorial1_handle_collapse(event_collase_damage) {
+    if (g_tutorials_flags.tutorial_1.collapse) {
+        return;
+    }
+
+    g_city_events.removeListener(typeid(event_collase_damage), &tutorial1_handle_collapse);
+
+    g_tutorials_flags.tutorial_1.collapse = true;
+    building_menu_update(tutorial_stage.tutorial_collapse);
+    post_message(MESSAGE_TUTORIAL_COLLAPSED_BUILDING);
+}
+
 bool tutorial1_is_success() {
     auto &tut = g_tutorials_flags.tutorial_1;
     return tut.fire && tut.collapse && tut.population_150_reached && tut.gamemeat_400_stored;
@@ -207,6 +219,8 @@ bool tutorial_menu_update(int tut) {
         else g_city_events.appendListener(typeid(event_population_changed), &tutorial1_handle_population_changed);
 
         if (g_tutorials_flags.tutorial_1.collapse) building_menu_update(tutorial_stage.tutorial_collapse);
+        else g_city_events.appendListener(typeid(event_collase_damage), &tutorial1_handle_collapse);
+
         if (g_tutorials_flags.tutorial_1.gamemeat_400_stored) building_menu_update(tutorial_stage.tutorial_water);
 
         g_city.victory_state.add_condition(&tutorial1_is_success);
@@ -336,21 +350,11 @@ int tutorial_extra_fire_risk(void) {
            && scenario_is_mission_rank(1); // Fix for extra fire risk in late tutorials
 }
 
-int tutorial_extra_damage_risk(void) {
+int tutorial_extra_damage_risk() {
     return g_tutorials_flags.tutorial_1.fire && !g_tutorials_flags.tutorial_1.collapse
            && scenario_is_mission_rank(1); // Fix for extra damage risk in late tutorials
 }
 
-int tutorial_handle_collapse(void) {
-    if (g_tutorials_flags.tutorial_1.collapse)
-        return 0;
-
-    g_tutorials_flags.tutorial_1.collapse = 1;
-    building_menu_update(tutorial_stage.tutorial_collapse);
-    post_message(MESSAGE_TUTORIAL_COLLAPSED_BUILDING);
-    return 1;
-}
-
 void tutorial_flags_t::on_crime() {
     if (!g_tutorials_flags.pharaoh.crime) {
         g_tutorials_flags.pharaoh.crime = 1;
@@ -439,7 +443,7 @@ void tutorial_update_step(pcstr s) {
     const xstring step(s);
     if (step == tutorial_stage.tutorial_fire) {
         g_tutorials_flags.tutorial_1.fire = false;
-        tutorial1_handle_fire(event_fire_damage{0});
+        tutorial1_handle_fire({0});
     } else if (step == tutorial_stage.tutorial_food) {
         building_menu_update(step);
         post_message(MESSAGE_TUTORIAL_FOOD_OR_FAMINE);
@@ -448,7 +452,7 @@ void tutorial_update_step(pcstr s) {
         post_message(MESSAGE_TUTORIAL_CLEAN_WATER);
     } else if (step == tutorial_stage.tutorial_collapse) {
         g_tutorials_flags.tutorial_1.collapse = false;
-        tutorial_handle_collapse();
+        tutorial1_handle_collapse({0});
     } else if (step == tutorial_stage.tutorial_gods) {
         building_menu_update(step);
         post_message(MESSAGE_TUTORIAL_GODS_OF_EGYPT);

src/game/tutorial.h

@@ -100,7 +100,6 @@ int tutorial_get_immediate_goal_text();
 int tutorial_adjust_request_year(int* year);
 
 int tutorial_extra_damage_risk();
-int tutorial_handle_collapse();
 
 void tutorial_on_disease();
 void tutorial_on_filled_granary(int quantity);