Fix UI and add city sounds (#1173)

* Fix UI indentation

* small fix

* Show warning text if the work camp and architect's guild is not connected to the road.

* Fix offset text forum and senate if no road access

* minor visual fix labor, military, trade, health and education advisors

* add warning text to Caravanserai and Lighthouse if no road access. add sound to Lighthouse

* minor fix Caravanserai

* add warning text to Mission post if no road access

* add city sounds

* Minor edits in the 'View message' window

* fixed text line length in Hippodrome when the bet is already set.

* Minor edits in the 'Hold Games' window

* add 2 ambient sound (empty land)  and Cartdepo city sound

* Increased time to 3 seconds (from 2) 'Only play 1 sound every 3 seconds' to reduce the cacophony of sounds.

* Minor edits in the 'Chief Advisor' window

* Minor edits in the 'Entertainment Advisor' window

* Minor edits in the 'Religion Advisor' window

* add new assets sound for Brickworks, Lighthouse, Depot

* change "Depot" sound on "granary2.wav" when you right click

* Update src/window/message_list.c

Co-authored-by: José Cadete <crudelios@gmail.com>

* Update src/window/building/culture.c

Co-authored-by: José Cadete <crudelios@gmail.com>

* Update src/window/building/utility.c

Co-authored-by: José Cadete <crudelios@gmail.com>

---------

Co-authored-by: José Cadete <crudelios@gmail.com>

src/sound/channel.h

@@ -10,7 +10,7 @@ enum {
 
     // city sounds (from buildings)
     SOUND_CHANNEL_CITY_MIN = 48,
-    SOUND_CHANNEL_CITY_MAX = 152,
+    SOUND_CHANNEL_CITY_MAX = 155,
 
     SOUND_CHANNEL_MAX = SOUND_CHANNEL_CITY_MAX + 1
 };

src/sound/city.c

@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#define MAX_CHANNELS 70
+#define MAX_CHANNELS 80
 
 // for compatibility with the original game:
 #define CITY_CHANNEL_OFFSET 18
@@ -41,14 +41,20 @@ enum {
     SOUND_CHANNEL_CITY_PREFECTURE = 69,
     SOUND_CHANNEL_CITY_FORT = 70,
     SOUND_CHANNEL_CITY_TOWER = 74,
+    SOUND_CHANNEL_CITY_WATCHTOWER = 75,
+    SOUND_CHANNEL_CITY_ARMOURY = 76,
+    SOUND_CHANNEL_CITY_WORKCAMP = 77,
     SOUND_CHANNEL_CITY_TEMPLE_CERES = 78,
     SOUND_CHANNEL_CITY_TEMPLE_NEPTUNE = 79,
     SOUND_CHANNEL_CITY_TEMPLE_MERCURY = 80,
     SOUND_CHANNEL_CITY_TEMPLE_MARS = 81,
     SOUND_CHANNEL_CITY_TEMPLE_VENUS = 82,
     SOUND_CHANNEL_CITY_MARKET = 83,
+    SOUND_CHANNEL_CITY_CARAVANSERAI = 84,
+    SOUND_CHANNEL_CITY_TAVERN = 85,
     SOUND_CHANNEL_CITY_GRANARY = 87,
     SOUND_CHANNEL_CITY_WAREHOUSE = 89,
+    SOUND_CHANNEL_CITY_MESS_HALL = 90,
     SOUND_CHANNEL_CITY_SHIPYARD = 91,
     SOUND_CHANNEL_CITY_DOCK = 93,
     SOUND_CHANNEL_CITY_WHARF = 95,
@@ -77,11 +83,17 @@ enum {
     SOUND_CHANNEL_CITY_WEAPONS_WORKSHOP = 125,
     SOUND_CHANNEL_CITY_FURNITURE_WORKSHOP = 126,
     SOUND_CHANNEL_CITY_POTTERY_WORKSHOP = 127,
-    SOUND_CHANNEL_CITY_EMPTY_LAND = 128,
-    SOUND_CHANNEL_CITY_RIVER = 132,
-    SOUND_CHANNEL_CITY_MISSION_POST = 133,
-    SOUND_CHANNEL_CITY_CONSTRUCTION_SITE = 134,
-    SOUND_CHANNEL_CITY_ARMOURY = 76
+    SOUND_CHANNEL_CITY_EMPTY_LAND1 = 128,
+    SOUND_CHANNEL_CITY_EMPTY_LAND2 = 129,
+    SOUND_CHANNEL_CITY_EMPTY_LAND3 = 130,
+    //SOUND_CHANNEL_CITY_EMPTY_LAND4 = 131,
+    SOUND_CHANNEL_CITY_CITY_MINT = 132,
+    SOUND_CHANNEL_CITY_RIVER = 133,
+    SOUND_CHANNEL_CITY_MISSION_POST = 134,
+    SOUND_CHANNEL_CITY_BRICKWORKS = 135,
+    SOUND_CHANNEL_CITY_LIGHTHOUSE = 136,
+    SOUND_CHANNEL_CITY_DEPOT = 137,
+    SOUND_CHANNEL_CITY_CONSTRUCTION_SITE = 138,
 };
 
 typedef struct {
@@ -98,8 +110,8 @@ typedef struct {
 } city_channel;
 
 static city_channel channels[MAX_CHANNELS];
-static int ambient_channels[] = { 61 };
-static int ambient_channels_number = 1;
+static int ambient_channels[] = { 61, 74, 75, };    // turn on "empty land" sound
+static int ambient_channels_number = 3;
 
 static const int BUILDING_TYPE_TO_CHANNEL_ID[] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0-9
@@ -113,15 +125,15 @@ static const int BUILDING_TYPE_TO_CHANNEL_ID[] = {
     63, 37, 0, 0, 38, 38, 39, 39, 0, 0, // 80-89
     40, 0, 0, 0, 43, 0, 0, 0, 44, 45, //90-99
     46, 47, 48, 49, 50, 51, 52, 53, 54, 55, //100-109
-    56, 57, 58, 59, 60, 0, 37, 25, 26, 27, //110-119
+    56, 57, 58, 59, 60, 0, 70, 25, 26, 27, //110-119    WORKCAMP = 116[70]
     28, 29, 0, 0, 0, 0, 0, 0, 0, 0, //120-129
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //130-139
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //140-149
-    0, 0, 44, 37, 0, 0, 0, 0, 56, 0, //150-159
+    0, 0, 44, 37, 68, 69, 0, 0, 66, 0, //150-159        MESS_HALL = 154[68], LIGHTHOUSE = 155[69], TAVERN = 158[66]
     9, 0, 0, 0, 0, 0, 0, 0, 0, 0, //160-169
-    44, 44, 44, 24, 0, 0, 0, 0, 0, 0, //170-179
-    0, 0, 0, 0, 53, 0, 0, 55, 52, 0, //180-189
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //190-199
+    44, 44, 44, 71, 0, 0, 67, 0, 0, 0, //170-179        WATCHTOWER = 173[71], CARAVANSERAI = 176[67]
+    0, 0, 0, 0, 53, 72, 73, 55, 52, 0, //180-189        CITY_MINT = 185[72], DEPOT = 186[73]
+    77, 0, 0, 0, 0, 0, 0, 0, 0, 0, //190-199            BRICKWORKS = 190[77]
     0, 0, 0, 65, 0, 0, 0, 0, 0, 0, //200-209
 };
 
@@ -134,7 +146,7 @@ void sound_city_init(void)
     for (int i = 0; i < MAX_CHANNELS; i++) {
         channels[i].last_played_time = last_update_time;
     }
-    for (int i = 1; i < 66; i++) {
+    for (int i = 1; i < 80; i++) {
         channels[i].in_use = 1;
         channels[i].views_threshold = 200;
         channels[i].delay_millis = 30000;
@@ -199,11 +211,23 @@ void sound_city_init(void)
     channels[58].channel = SOUND_CHANNEL_CITY_WEAPONS_WORKSHOP;
     channels[59].channel = SOUND_CHANNEL_CITY_FURNITURE_WORKSHOP;
     channels[60].channel = SOUND_CHANNEL_CITY_POTTERY_WORKSHOP;
-    channels[61].channel = SOUND_CHANNEL_CITY_EMPTY_LAND;
+    channels[61].channel = SOUND_CHANNEL_CITY_EMPTY_LAND1;
     channels[62].channel = SOUND_CHANNEL_CITY_RIVER;
     channels[63].channel = SOUND_CHANNEL_CITY_MISSION_POST;
     channels[64].channel = SOUND_CHANNEL_CITY_CONSTRUCTION_SITE;
     channels[65].channel = SOUND_CHANNEL_CITY_ARMOURY;
+    channels[66].channel = SOUND_CHANNEL_CITY_TAVERN;
+    channels[67].channel = SOUND_CHANNEL_CITY_CARAVANSERAI;
+    channels[68].channel = SOUND_CHANNEL_CITY_MESS_HALL;
+    channels[69].channel = SOUND_CHANNEL_CITY_LIGHTHOUSE;
+    channels[70].channel = SOUND_CHANNEL_CITY_WORKCAMP;
+    channels[71].channel = SOUND_CHANNEL_CITY_WATCHTOWER;
+    channels[72].channel = SOUND_CHANNEL_CITY_CITY_MINT;
+    channels[73].channel = SOUND_CHANNEL_CITY_DEPOT;
+    channels[74].channel = SOUND_CHANNEL_CITY_EMPTY_LAND2;
+    channels[75].channel = SOUND_CHANNEL_CITY_EMPTY_LAND3;
+    //channels[76].channel = SOUND_CHANNEL_CITY_EMPTY_LAND4;
+    channels[77].channel = SOUND_CHANNEL_CITY_BRICKWORKS;
 }
 
 void sound_city_set_volume(int percentage)
@@ -316,8 +340,8 @@ void sound_city_play(void)
         }
     }
 
-    if (now - last_update_time < 2000) {
-        // Only play 1 sound every 2 seconds
+    if (now - last_update_time < 3000) {
+        // Only play 1 sound every 3 seconds
         return;
     }
     time_millis max_delay = 0;
@@ -331,7 +355,7 @@ void sound_city_play(void)
         }
     }
     if (!max_sound_id) {
-       // progress_ambient();
+        // progress_ambient();
         return;
     }
 

src/sound/system.c

@@ -106,22 +106,22 @@ static char channel_filenames[SOUND_CHANNEL_MAX][CHANNEL_FILENAME_MAX] = {
     "",
     "",
     "wavs/tower1.wav",
-    "",
+    "wavs/tower2.wav",
     "wavs/tower3.wav",
-    "",
+    "wavs/tower4.wav",
     "wavs/temp_farm.wav",
     "wavs/temp_ship.wav",
     "wavs/temp_comm.wav",
     "wavs/temp_war.wav",
     "wavs/temp_love.wav",
     "wavs/market1.wav",
-    "",
-    "",
+    "wavs/market2.wav",
+    "wavs/market3.wav",
     "",
     "wavs/granary1.wav",
-    "",
+    "wavs/granary2.wav",
     "wavs/warehouse1.wav",
-    "",
+    "wavs/warehouse2.wav",
     "wavs/shipyard1.wav",
     "",
     "wavs/dock1.wav",
@@ -160,12 +160,15 @@ static char channel_filenames[SOUND_CHANNEL_MAX][CHANNEL_FILENAME_MAX] = {
     "wavs/furn_workshop.wav",
     "wavs/pott_workshop.wav",
     "wavs/empty_land1.wav",
+    "wavs/empty_land2.wav",
+    "wavs/empty_land3.wav",
     "",
-    "",
-    "",
+    "wavs/coin.wav",
     "wavs/river.wav",
     "wavs/mission.wav",
-    "wavs/tower4.wav"
+    "assets/sounds/brickworks.wav",
+    "assets/sounds/lighthouse.wav",
+    "assets/sounds/ox.wav",
 };
 
 static void correct_channel_filenames(void)

src/window/advisor/chief.c

@@ -22,7 +22,7 @@
 
 
 #define ADVISOR_HEIGHT 24
-#define X_OFFSET 232
+#define X_OFFSET 225
 
 static void draw_title(int y, int text_id)
 {

src/window/advisor/education.c

@@ -135,7 +135,7 @@ static int draw_background(void)
     text_draw_number_centered(building_count_active(BUILDING_MISSION_POST), 150, 165, 100, FONT_NORMAL_WHITE);
 
 
-    lang_text_draw_multiline(57, 22 + get_education_advice(), 60, 195, 512, FONT_NORMAL_BLACK);
+    lang_text_draw_multiline(57, 22 + get_education_advice(), 45, 195, 560, FONT_NORMAL_BLACK);
 
     return ADVISOR_HEIGHT;
 }

src/window/advisor/entertainment.c

@@ -105,7 +105,7 @@ static int draw_background(void)
 
     lang_text_draw(58, 0, 60, 12, FONT_LARGE_BLACK);
 
-    lang_text_draw(58, 1, 180, 46, FONT_SMALL_PLAIN);
+    lang_text_draw(58, 1, 173, 46, FONT_SMALL_PLAIN);
     lang_text_draw(58, 2, 260, 46, FONT_SMALL_PLAIN);
     lang_text_draw(58, 3, PEOPLE_OFFSET + 10, 46, FONT_SMALL_PLAIN);
     lang_text_draw_centered(58, 4, COVERAGE_OFFSET, 46, COVERAGE_WIDTH, FONT_SMALL_PLAIN);
@@ -114,81 +114,81 @@ static int draw_background(void)
 
     // taverns
     lang_text_draw_amount(CUSTOM_TRANSLATION, TR_WINDOW_ADVISOR_ENTERTAINMENT_TAVERN_COVERAGE,
-        building_count_total(BUILDING_TAVERN), 40, 64, FONT_NORMAL_WHITE);
-    text_draw_number_centered(building_count_active(BUILDING_TAVERN), 150, 64, 100, FONT_NORMAL_WHITE);
-    lang_text_draw_centered(56, 2, 230, 64, 100, FONT_NORMAL_WHITE);
+        building_count_total(BUILDING_TAVERN), 40, 67, FONT_NORMAL_WHITE);
+    text_draw_number_centered(building_count_active(BUILDING_TAVERN), 150, 67, 100, FONT_NORMAL_WHITE);
+    lang_text_draw_centered(56, 2, 230, 67, 100, FONT_NORMAL_WHITE);
     int width = text_draw_number(city_culture_get_tavern_person_coverage(), '_', " ",
-        PEOPLE_OFFSET, 64, FONT_NORMAL_WHITE, 0);
-    lang_text_draw(58, 5, PEOPLE_OFFSET + width, 64, FONT_NORMAL_WHITE);
+        PEOPLE_OFFSET, 67, FONT_NORMAL_WHITE, 0);
+    lang_text_draw(58, 5, PEOPLE_OFFSET + width, 67, FONT_NORMAL_WHITE);
     int pct_tavern = city_culture_coverage_tavern();
     if (pct_tavern == 0) {
-        lang_text_draw_centered(57, 10, COVERAGE_OFFSET, 64, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 10, COVERAGE_OFFSET, 67, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     } else if (pct_tavern < 100) {
-        lang_text_draw_centered(57, 11 + pct_tavern / 10, COVERAGE_OFFSET, 64, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 11 + pct_tavern / 10, COVERAGE_OFFSET, 67, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     } else {
-        lang_text_draw_centered(57, 21, COVERAGE_OFFSET, 64, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 21, COVERAGE_OFFSET, 67, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     }
 
     // theaters
-    lang_text_draw_amount(8, 34, building_count_total(BUILDING_THEATER), 40, 84, FONT_NORMAL_WHITE);
-    text_draw_number_centered(building_count_active(BUILDING_THEATER), 150, 84, 100, FONT_NORMAL_WHITE);
-    text_draw_number_centered(city_entertainment_theater_shows(), 230, 84, 100, FONT_NORMAL_WHITE);
+    lang_text_draw_amount(8, 34, building_count_total(BUILDING_THEATER), 40, 87, FONT_NORMAL_WHITE);
+    text_draw_number_centered(building_count_active(BUILDING_THEATER), 150, 87, 100, FONT_NORMAL_WHITE);
+    text_draw_number_centered(city_entertainment_theater_shows(), 230, 87, 100, FONT_NORMAL_WHITE);
     width = text_draw_number(city_culture_get_theatre_person_coverage(), '_', " ",
-        PEOPLE_OFFSET, 84, FONT_NORMAL_WHITE, 0);
-    lang_text_draw(58, 5, PEOPLE_OFFSET + width, 84, FONT_NORMAL_WHITE);
+        PEOPLE_OFFSET, 87, FONT_NORMAL_WHITE, 0);
+    lang_text_draw(58, 5, PEOPLE_OFFSET + width, 87, FONT_NORMAL_WHITE);
     int pct_theater = city_culture_coverage_theater();
     if (pct_theater == 0) {
-        lang_text_draw_centered(57, 10, COVERAGE_OFFSET, 84, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 10, COVERAGE_OFFSET, 87, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     } else if (pct_theater < 100) {
-        lang_text_draw_centered(57, 11 + pct_theater / 10, COVERAGE_OFFSET, 84, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 11 + pct_theater / 10, COVERAGE_OFFSET, 87, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     } else {
-        lang_text_draw_centered(57, 21, COVERAGE_OFFSET, 84, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 21, COVERAGE_OFFSET, 87, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     }
 
     // amphitheaters
-    lang_text_draw_amount(8, 36, building_count_total(BUILDING_AMPHITHEATER), 40, 104, FONT_NORMAL_WHITE);
-    text_draw_number_centered(building_count_active(BUILDING_AMPHITHEATER), 150, 104, 100, FONT_NORMAL_WHITE);
-    text_draw_number_centered(city_entertainment_amphitheater_shows(), 230, 104, 100, FONT_NORMAL_WHITE);
+    lang_text_draw_amount(8, 36, building_count_total(BUILDING_AMPHITHEATER), 40, 107, FONT_NORMAL_WHITE);
+    text_draw_number_centered(building_count_active(BUILDING_AMPHITHEATER), 150, 107, 100, FONT_NORMAL_WHITE);
+    text_draw_number_centered(city_entertainment_amphitheater_shows(), 230, 107, 100, FONT_NORMAL_WHITE);
     width = text_draw_number(city_culture_get_ampitheatre_person_coverage(), '@', " ",
-        PEOPLE_OFFSET, 104, FONT_NORMAL_WHITE, 0);
-    lang_text_draw(58, 5, PEOPLE_OFFSET + width, 104, FONT_NORMAL_WHITE);
+        PEOPLE_OFFSET, 107, FONT_NORMAL_WHITE, 0);
+    lang_text_draw(58, 5, PEOPLE_OFFSET + width, 107, FONT_NORMAL_WHITE);
     int pct_amphitheater = city_culture_coverage_amphitheater();
     if (pct_amphitheater == 0) {
-        lang_text_draw_centered(57, 10, COVERAGE_OFFSET, 104, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 10, COVERAGE_OFFSET, 107, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     } else if (pct_amphitheater < 100) {
         lang_text_draw_centered(57, 11 + pct_amphitheater / 10,
-            COVERAGE_OFFSET, 104, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+            COVERAGE_OFFSET, 107, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     } else {
-        lang_text_draw_centered(57, 21, COVERAGE_OFFSET, 104, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 21, COVERAGE_OFFSET, 107, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     }
 
     // arenas
     lang_text_draw_amount(CUSTOM_TRANSLATION, TR_WINDOW_ADVISOR_ENTERTAINMENT_ARENA_COVERAGE,
-        building_count_total(BUILDING_ARENA), 40, 124, FONT_NORMAL_WHITE);
-    text_draw_number_centered(building_count_active(BUILDING_ARENA), 150, 124, 100, FONT_NORMAL_WHITE);
-    width = text_draw_number(city_culture_get_arena_person_coverage(), '_', " ", PEOPLE_OFFSET, 124, FONT_NORMAL_WHITE, 0);
-    lang_text_draw(58, 5, PEOPLE_OFFSET + width, 124, FONT_NORMAL_WHITE);
-    text_draw_number_centered(city_entertainment_arena_shows(), 230, 124, 100, FONT_NORMAL_WHITE);
+        building_count_total(BUILDING_ARENA), 40, 127, FONT_NORMAL_WHITE);
+    text_draw_number_centered(building_count_active(BUILDING_ARENA), 150, 127, 100, FONT_NORMAL_WHITE);
+    width = text_draw_number(city_culture_get_arena_person_coverage(), '_', " ", PEOPLE_OFFSET, 127, FONT_NORMAL_WHITE, 0);
+    lang_text_draw(58, 5, PEOPLE_OFFSET + width, 127, FONT_NORMAL_WHITE);
+    text_draw_number_centered(city_entertainment_arena_shows(), 230, 127, 100, FONT_NORMAL_WHITE);
     int pct = city_culture_coverage_arena();
     if (pct == 0) {
-        lang_text_draw_centered(57, 10, COVERAGE_OFFSET, 124, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 10, COVERAGE_OFFSET, 127, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     } else if (pct < 100) {
-        lang_text_draw_centered(57, 11 + pct / 10, COVERAGE_OFFSET, 124, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 11 + pct / 10, COVERAGE_OFFSET, 127, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     } else {
-        lang_text_draw_centered(57, 21, COVERAGE_OFFSET, 124, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+        lang_text_draw_centered(57, 21, COVERAGE_OFFSET, 127, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
     }
 
     // colosseums
     int has_colosseum = building_count_active(BUILDING_COLOSSEUM) ? 1 : 0;
-    lang_text_draw(CUSTOM_TRANSLATION, TR_ADVISOR_NO_ACTIVE_COLOSSEUM + has_colosseum, 40, 143, FONT_NORMAL_WHITE);
-    lang_text_draw_centered(57, has_colosseum ? 21 : 10, COVERAGE_OFFSET, 143, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+    lang_text_draw(CUSTOM_TRANSLATION, TR_ADVISOR_NO_ACTIVE_COLOSSEUM + has_colosseum, 45, 148, FONT_NORMAL_WHITE);
+    lang_text_draw_centered(57, has_colosseum ? 21 : 10, COVERAGE_OFFSET, 148, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
 
     // hippodromes
     int has_hippodrome = building_count_active(BUILDING_HIPPODROME) ? 1 : 0;
-    lang_text_draw(CUSTOM_TRANSLATION, TR_ADVISOR_NO_ACTIVE_HIPPODROME + has_hippodrome, 40, 163, FONT_NORMAL_WHITE);
-    lang_text_draw_centered(57, has_hippodrome ? 21 : 10, COVERAGE_OFFSET, 163, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
+    lang_text_draw(CUSTOM_TRANSLATION, TR_ADVISOR_NO_ACTIVE_HIPPODROME + has_hippodrome, 45, 168, FONT_NORMAL_WHITE);
+    lang_text_draw_centered(57, has_hippodrome ? 21 : 10, COVERAGE_OFFSET, 168, COVERAGE_WIDTH, FONT_NORMAL_WHITE);
 
-    lang_text_draw_multiline(58, 7 + get_entertainment_advice(), 60, 198, 512, FONT_NORMAL_BLACK);
+    lang_text_draw_multiline(58, 7 + get_entertainment_advice(), 52, 208, 540, FONT_NORMAL_BLACK);
 
     draw_games_info();
 

src/window/advisor/health.c

@@ -67,9 +67,9 @@ static int draw_background(void)
     text_draw_number(city_health(), 0, "", 60 + x_offset, 44, FONT_NORMAL_BLACK, 0);
 
     if (city_population() >= 200) {
-        lang_text_draw_multiline(56, city_health() / 10 + 16, 60, 62, 512, FONT_NORMAL_BLACK);
+        lang_text_draw_multiline(56, city_health() / 10 + 16, 60, 65, 560, FONT_NORMAL_BLACK);
     } else {
-        lang_text_draw_multiline(56, 15, 60, 62, 512, FONT_NORMAL_BLACK);
+        lang_text_draw_multiline(56, 15, 60, 65, 560, FONT_NORMAL_BLACK);
     }
     lang_text_draw(56, 3, 180, 110, FONT_SMALL_PLAIN);
     lang_text_draw(56, 4, 290, 110, FONT_SMALL_PLAIN);
@@ -91,12 +91,12 @@ static int draw_background(void)
     people_covered = 1000 * building_count_active(BUILDING_HOSPITAL);
     print_health_building_info(188, BUILDING_HOSPITAL, people_covered, city_culture_coverage_hospital());
 
-    int text_height = lang_text_draw_multiline(56, 7 + get_health_advice(), 60, 226, 512, FONT_NORMAL_BLACK);
+    int text_height = lang_text_draw_multiline(56, 7 + get_health_advice(), 45, 226, 560, FONT_NORMAL_BLACK);
 
-    lang_text_draw(CUSTOM_TRANSLATION, TR_ADVISOR_HEALTH_SURVEILLANCE, 60, 246 + text_height, FONT_NORMAL_BLACK);
+    lang_text_draw(CUSTOM_TRANSLATION, TR_ADVISOR_HEALTH_SURVEILLANCE, 45, 246 + text_height, FONT_NORMAL_BLACK);
     text_height += 16;
     text_draw_multiline(translation_for(TR_ADVISOR_SICKNESS_LEVEL_LOW + sickness_level),
-        60, 246 + text_height, 512, 0, FONT_NORMAL_BLACK, 0);
+        45, 246 + text_height, 560, 0, FONT_NORMAL_BLACK, 0);
 
     return ADVISOR_HEIGHT;
 }

src/window/advisor/labor.c

@@ -47,9 +47,9 @@ static int draw_background(void)
 
     // table headers
     lang_text_draw(50, 21, 60, 56, FONT_SMALL_PLAIN);
-    lang_text_draw(50, 22, 170, 56, FONT_SMALL_PLAIN);
-    lang_text_draw(50, 23, 400, 56, FONT_SMALL_PLAIN);
-    lang_text_draw(50, 24, 500, 56, FONT_SMALL_PLAIN);
+    lang_text_draw(50, 22, 172, 56, FONT_SMALL_PLAIN);
+    lang_text_draw(50, 23, 416, 56, FONT_SMALL_PLAIN);
+    lang_text_draw(50, 24, 516, 56, FONT_SMALL_PLAIN);
 
     // xx employed, yy unemployed
     int width = text_draw_number(city_labor_workers_employed(), '@', " ", 32, 320, FONT_NORMAL_BLACK, 0);