feat: add city message when monument mastaba is finished

Author: s.kushnirenko

src/building/building.h

@@ -392,6 +392,8 @@ class building_impl {
     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); }
+    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/monument_mastaba.cpp

@@ -9,6 +9,7 @@
 #include "building/count.h"
 #include "game/game.h"
 #include "city/resource.h"
+#include "city/message.h"
 #include "grid/random.h"
 #include "grid/tiles.h"
 #include "grid/grid.h"
@@ -127,6 +128,12 @@ void building_small_mastaba::update_day() {
 
     if (data.monuments.phase >= 8) {
         building_small_mastabe_finalize(&base);
+        if (is_main()) {
+            city_message_options message;
+            message.force_popup = true;
+            message.hide_img = true;
+            city_message_post_with_popup_delay(MESSAGE_CAT_MONUMENTS, MESSAGE_MASTABA_FINISHED, type(), tile().grid_offset(), &message);
+        }
         return;
     }
 

src/city/message.cpp

@@ -17,7 +17,6 @@
 
 #define MAX_MESSAGES 1000
 #define MAX_QUEUE 20
-#define MAX_MESSAGE_CATEGORIES 20
 
 struct message_data_t {
     city_message messages[MAX_MESSAGES];
@@ -49,8 +48,8 @@ struct message_data_t {
         uint16_t pop25000 : 1;
     } population_shown;
 
-    int message_count[MAX_MESSAGE_CATEGORIES];
-    int message_delay[MAX_MESSAGE_CATEGORIES];
+    int message_count[MESSAGE_CAT_SIZE];
+    int message_delay[MESSAGE_CAT_SIZE];
 
     time_millis last_sound_time[MESSAGE_CAT_RIOT_COLLAPSE + 1];
 
@@ -79,7 +78,7 @@ void city_message_init_scenario(void) {
     data.total_messages = 0;
     data.current_message_id = 0;
 
-    for (int i = 0; i < MAX_MESSAGE_CATEGORIES; i++) {
+    for (int i = 0; i < MESSAGE_CAT_SIZE; i++) {
         data.message_count[i] = 0;
         data.message_delay[i] = 0;
     }
@@ -225,7 +224,7 @@ void city_message_post_full(bool use_popup, int template_id, int event_id, int p
     should_play_sound = true;
 }
 
-static void city_message_post_common(bool use_popup, int message_id, int param1, int param2, int god, int bg_img) {
+static void city_message_post_common(bool use_popup, int message_id, int param1, int param2, int god, int bg_img, city_message_options *opts) {
     auto &data = g_message_data;
 
     int id = new_message_id();
@@ -249,7 +248,8 @@ static void city_message_post_common(bool use_popup, int message_id, int param1,
     msg->param2 = param2;
     msg->sequence = data.next_message_sequence++;
     msg->god = god;
-    msg->background_img = bg_img;
+    msg->hide_img = (opts && opts->hide_img);
+    msg->background_img = (opts && (opts->force_img >= 0)) ? opts->force_img : bg_img;
 
     int text_id = city_message_get_text_id(message_id);
     int lang_msg_type = lang_get_message(text_id)->message_type;
@@ -271,30 +271,33 @@ static void city_message_post_common(bool use_popup, int message_id, int param1,
 }
 
 void city_message_god_post(int god, bool use_popup, int message_id, int param1, int param2) {
-    city_message_post_common(use_popup, message_id, param1, param2, god, 0);
+    city_message_post_common(use_popup, message_id, param1, param2, god, 0, nullptr);
 }
 
 void city_message_population_post(bool use_popup, int message_id, int param1, int param2) {
     int img_id = image_id_from_group(GROUP_PANEL_GODS_DIALOGDRAW) + 16;
-    city_message_post_common(use_popup, message_id, param1, param2, GOD_UNKNOWN, img_id);
+    city_message_post_common(use_popup, message_id, param1, param2, GOD_UNKNOWN, img_id, nullptr);
 }
 
-void city_message_post(bool use_popup, int message_id, int param1, int param2) {
-    city_message_post_common(use_popup, message_id, param1, param2, GOD_UNKNOWN, 0);
+void city_message_post(bool use_popup, int message_id, int param1, int param2, city_message_options *opts) {
+    city_message_post_common(use_popup, message_id, param1, param2, GOD_UNKNOWN, 0, opts);
 }
 
-void city_message_post_with_popup_delay(int category, int message_type, int param1, short param2) {
+void city_message_post_with_popup_delay(e_mesage_category category, int message_type, int param1, short param2, city_message_options *opts) {
     auto& data = g_message_data;
     int use_popup = false;
+
     if (data.message_delay[category] <= 0) {
         use_popup = true;
         data.message_delay[category] = 12;
     }
-    city_message_post(use_popup, message_type, param1, param2);
+    use_popup |= (opts && opts->force_popup);
+
+    city_message_post(use_popup, message_type, param1, param2, opts);
     data.message_count[category]++;
 }
 
-void city_message_post_with_message_delay(int category, int use_popup, int message_type, int delay) {
+void city_message_post_with_message_delay(e_mesage_category category, int use_popup, int message_type, int delay) {
     auto& data = g_message_data;
     if (category == MESSAGE_CAT_FISHING_BLOCKED || category == MESSAGE_CAT_NO_WORKING_DOCK) {
         // bug in the original game: delays for 'fishing blocked' and 'no working dock'
@@ -414,22 +417,22 @@ int city_message_get_advisor(int message_type) {
     }
 }
 
-void city_message_reset_category_count(int category) {
+void city_message_reset_category_count(e_mesage_category category) {
     auto& data = g_message_data;
     data.message_count[category] = 0;
 }
-void city_message_increase_category_count(int category) {
+void city_message_increase_category_count(e_mesage_category category) {
     auto& data = g_message_data;
     data.message_count[category]++;
 }
-int city_message_get_category_count(int category) {
+int city_message_get_category_count(e_mesage_category category) {
     auto& data = g_message_data;
     return data.message_count[category];
 }
 
 void city_message_decrease_delays(void) {
     auto& data = g_message_data;
-    for (int i = 0; i < MAX_MESSAGE_CATEGORIES; i++) {
+    for (int i = 0; i < MESSAGE_CAT_SIZE; i++) {
         if (data.message_delay[i] > 0)
             data.message_delay[i]--;
     }
@@ -587,7 +590,8 @@ io_buffer* iob_messages = new io_buffer([](io_buffer* iob, size_t version) {
         iob->bind(BIND_SIGNATURE_INT16, &msg->eventmsg_phrase_id);
         iob->bind(BIND_SIGNATURE_INT16, &msg->req_city_past); // enum?
         iob->bind(BIND_SIGNATURE_INT16, &msg->unk_09);        // 00 00
-        iob->bind(BIND_SIGNATURE_INT16, &msg->unk_10);        // 00 00
+        iob->bind(BIND_SIGNATURE_UINT8, &msg->unk_10);        // 00 00
+        iob->bind(BIND_SIGNATURE_UINT8, &msg->hide_img);        // 00 00
 
         iob->bind(BIND_SIGNATURE_INT16, &msg->req_amount_past);
         iob->bind(BIND_SIGNATURE_INT16, &msg->req_resource_past);
@@ -613,11 +617,11 @@ io_buffer* iob_message_extra = new io_buffer([](io_buffer* iob, size_t version)
     iob->bind(BIND_SIGNATURE_UINT16, &data.reserved_5);
     iob->bind(BIND_SIGNATURE_UINT8, &data.reserved_6);
 
-    for (int i = 0; i < MAX_MESSAGE_CATEGORIES; i++) {
+    for (int i = 0; i < MESSAGE_CAT_SIZE; i++) {
         iob->bind(BIND_SIGNATURE_INT32, &data.message_count[i]);
     }
 
-    for (int i = 0; i < MAX_MESSAGE_CATEGORIES; i++) {
+    for (int i = 0; i < MESSAGE_CAT_SIZE; i++) {
         iob->bind(BIND_SIGNATURE_INT32, &data.message_delay[i]);
     }
 });

src/city/message.h

@@ -13,6 +13,9 @@ enum e_mesage_category {
     MESSAGE_CAT_NO_WORKING_DOCK = 10,
     MESSAGE_CAT_FISHING_BLOCKED = 11,
     MESSAGE_CAT_HEALTH_PROBLEM = 12,
+    MESSAGE_CAT_MONUMENTS = 13,
+
+    MESSAGE_CAT_SIZE = 20,
 };
 
 enum e_message_advisor {
@@ -128,6 +131,7 @@ enum e_message_type {
     MESSAGE_HEALTH_DISEASE = 325 - 99,
     MESSAGE_HEALTH_PLAGUE = 326 - 99,
     MESSAGE_HEALTH_MALARIA_PROBLEM = 327 - 99,
+    MESSAGE_MASTABA_FINISHED = 394 - 99,
     MESSAGE_SPIRIT_OF_MARS = 105,
     MESSAGE_CAESAR_RESPECT_1 = 106,
     MESSAGE_CAESAR_RESPECT_2 = 107,
@@ -288,26 +292,33 @@ struct city_message {
     int eventmsg_phrase_id;
     int req_city_past;
     int unk_09;
-    int unk_10;
+    uint8_t unk_10;
+    bool hide_img;
 
     int req_amount_past;
     int req_resource_past;
     int unk_11a_i8;
-    int god;
+    uint8_t god;
     uint16_t background_img;
 };
 
+struct city_message_options {
+    bool force_popup = false;
+    int force_img = -1;
+    bool hide_img = false;
+};
+
 void city_message_init_scenario();
 void city_message_init_problem_areas();
 
 void city_message_disable_sound_for_next_message(void);
 void city_message_apply_sound_interval(int category);
 
 void city_message_post_full(bool use_popup, int template_id, int event_id, int parent_event_id, int title_id, int body_id, int phrase_id, int param1, int param2);
-void city_message_post(bool use_popup, int message_id, int param1, int param2);
+void city_message_post(bool use_popup, int message_id, int param1, int param2, city_message_options *opts = nullptr);
 void city_message_god_post(int god, bool use_popup, int message_id, int param1, int param2);
-void city_message_post_with_popup_delay(int category, int message_type, int param1, short param2);
-void city_message_post_with_message_delay(int category, int use_popup, int message_type, int delay);
+void city_message_post_with_popup_delay(e_mesage_category category, int message_type, int param1, short param2, city_message_options *opts = nullptr);
+void city_message_post_with_message_delay(e_mesage_category category, int use_popup, int message_type, int delay);
 void city_message_population_post(bool use_popup, int message_id, int param1, int param2);
 
 void city_message_process_queue(void);
@@ -316,10 +327,10 @@ void city_message_sort_and_compact(void);
 int city_message_get_text_id(int message_id);
 int city_message_get_advisor(int message_type);
 
-void city_message_reset_category_count(int category);
-void city_message_increase_category_count(int category);
-int city_message_get_category_count(int category);
-void city_message_decrease_delays(void);
+void city_message_reset_category_count(e_mesage_category category);
+void city_message_increase_category_count(e_mesage_category category);
+int city_message_get_category_count(e_mesage_category category);
+void city_message_decrease_delays();
 
 bool city_message_mark_population_shown(int population);
 

src/window/message_dialog.cpp

@@ -338,15 +338,19 @@ static void draw_city_message_text(const lang_message* msg) {
 }
 
 static void draw_title(const lang_message* msg) {
-    painter ctx = game.painter();
     auto &data = g_message_dialog_data;
+
+    painter ctx = game.painter();
     uint8_t* text = msg->title.text;
+    const city_message *city_msg = city_message_get(data.message_id);
 
     if (data.is_eventmsg)
         text = data.title_text;
 
-    if (!text)
+    if (!text) {
         return;
+    }
+
     int image_id = get_message_image_id(msg);
     const image_t* img = image_id ? image_get(image_id) : 0;
     // title
@@ -361,7 +365,7 @@ static void draw_title(const lang_message* msg) {
     data.y_text = data.y + 48;
 
     // picture
-    if (img) {
+    if (img && !city_msg->hide_img) {
         int image_x = msg->image.x;
         int image_y = msg->image.y;
         ImageDraw::img_generic(ctx, image_id, vec2i{data.x + image_x, data.y + image_y});
@@ -409,7 +413,7 @@ static void draw_content(const lang_message* msg) {
     graphics_reset_clip_rectangle();
 }
 
-static void draw_background_normal(void) {
+static void draw_background_normal() {
     auto &data = g_message_dialog_data;
     rich_text_set_fonts(FONT_NORMAL_WHITE_ON_DARK, FONT_NORMAL_YELLOW);
     const lang_message* msg = lang_get_message(data.text_id);