Skip to content

Commit abf2f8d

Browse files
committed
ui: dont repeat mission speech after closing briefing window
1 parent f8092a8 commit abf2f8d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/scripts/ui.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,6 @@ window mission_briefing_window = {
648648
subtitle : text({pos:[32, 78], font : FONT_NORMAL_BLACK_ON_LIGHT }),
649649
objectives_panel : inner_panel({pos:[32, 96], size: {w:36, h:6} }),
650650
objectives_label : label({text : {group:62, id:10}, pos : {x:48, y:104}, font : FONT_NORMAL_WHITE_ON_DARK }),
651-
tocity_label : label({text : {group:62, id:7}, pos : {x:416, y:433}, font : FONT_NORMAL_BLACK_ON_LIGHT }),
652651

653652
goal_0 : label({pos:[32 + 16, 90 + 32], body : {w:15, h:1}, font : FONT_NORMAL_YELLOW, enabled: false }),
654653
goal_1 : label({pos:[288 + 16, 90 + 32], body : {w:15, h:1}, font : FONT_NORMAL_YELLOW, enabled: false }),
@@ -666,7 +665,8 @@ window mission_briefing_window = {
666665
dec_difficulty : image_button({pos:[65, 428], size:[17, 17], pack:PACK_GENERAL, id:212, offset:0 }),
667666
inc_difficulty : image_button({pos:[65 + 18, 428], size:[17, 17], pack:PACK_GENERAL, id:212, offset:3 }),
668667

669-
start_mission : next_button({pos:[516, 430]}),
668+
tocity_label : label({text : {group:62, id:7}, margin:{right:-140, bottom:0}, font : FONT_NORMAL_BLACK_ON_LIGHT }),
669+
start_mission : next_button({ margin:{right:-40, bottom:-3} }),
670670
}
671671
}
672672

src/window/window_mission_briefing.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ void ui::mission_briefing_window::init() {
5454
});
5555

5656
ui["start_mission"].onclick([this] {
57-
g_sound.speech_stop();
58-
g_sound.music_update(/*force*/true);
59-
6057
if (!is_review) {
6158
GamestateIO::load_mission(scenario_id, true);
6259
}
60+
61+
g_sound.speech_stop();
62+
g_sound.music_update(/*force*/true);
6363
window_city_show();
6464
city_mission_reset_save_start();
6565
});

0 commit comments

Comments
 (0)