@@ -41,7 +41,6 @@ static void button_undo(int param1, int param2);
41
41
static void button_help (int param1, int param2);
42
42
static void button_advisors (int param1, int param2);
43
43
static void button_empire (int param1, int param2);
44
- static void button_mission_briefing (int param1, int param2);
45
44
static void button_rotate_north (int param1, int param2);
46
45
static void button_rotate (int clockwise, int param2);
47
46
@@ -100,10 +99,9 @@ static image_button buttons_build_expanded[] = {
100
99
{COL1, ROW4, 35 , 45 , IB_NORMAL, GROUP_SIDEBAR_BUTTONS, 48 , button_undo, button_none, 0 , 0 , 1 },
101
100
};
102
101
103
- static image_button buttons_top_expanded[3 ] = {
102
+ static image_button buttons_top_expanded[] = {
104
103
{COL1 + 7 , 143 , 60 , 36 , IB_NORMAL, GROUP_SIDEBAR_BUTTONS, 64 , button_advisors, button_none, 0 , 0 , 1 },
105
104
{COL3 + 4 , 143 , 62 , 36 , IB_NORMAL, GROUP_SIDEBAR_BUTTONS, 68 , button_empire, button_help, 0 , MESSAGE_DIALOG_EMPIRE_MAP, 1 },
106
- {COL4 - 9 , ROW4, 43 , 45 , IB_NORMAL, GROUP_SIDEBAR_BUTTONS, 60 , button_mission_briefing, button_none, 0 , 0 , 1 },
107
105
};
108
106
109
107
ui::sidebar_window g_sidebar;
@@ -145,9 +143,10 @@ static void draw_buttons_collapsed(int x_offset) {
145
143
void ui::sidebar_window::draw_buttons_expanded () {
146
144
buttons_build_expanded[12 ].enabled = game_can_undo ();
147
145
ui[" goto_problem" ].readonly = !city_message_problem_area_count ();
146
+
148
147
image_buttons_draw ({x_offset, TOP_MENU_HEIGHT}, buttons_overlays_collapse_sidebar, 1 );
149
148
image_buttons_draw ({x_offset, TOP_MENU_HEIGHT}, buttons_build_expanded, std::size (buttons_build_expanded));
150
- image_buttons_draw ({x_offset, TOP_MENU_HEIGHT}, buttons_top_expanded, 3 );
149
+ image_buttons_draw ({x_offset, TOP_MENU_HEIGHT}, buttons_top_expanded, std::size (buttons_top_expanded) );
151
150
}
152
151
153
152
static void refresh_build_menu_buttons () {
@@ -176,6 +175,10 @@ void ui::sidebar_window::load(archive arch, pcstr section) {
176
175
177
176
arch.r_desc (" extra_block" , extra_block);
178
177
extra_block_x = arch.r_int (" extra_block_x" );
178
+
179
+ if (game.session .active ) {
180
+ init ();
181
+ }
179
182
}
180
183
181
184
void ui::sidebar_window::init () {
@@ -193,6 +196,9 @@ void ui::sidebar_window::init() {
193
196
194
197
ui[" show_messages" ].onclick ([] { window_message_list_show (); });
195
198
199
+ ui[" show_briefing" ].readonly = scenario_is_custom ();
200
+ ui[" show_briefing" ].onclick ([] { window_mission_briefing_show_review (); });
201
+
196
202
ui[" show_overlays" ]
197
203
.onclick ([] { window_overlay_menu_show (); })
198
204
.onrclick ([] { window_message_dialog_show (MESSAGE_DIALOG_OVERLAYS, -1 , window_city_draw_all);; });
@@ -365,10 +371,6 @@ static void button_advisors(int param1, int param2) {
365
371
static void button_empire (int param1, int param2) {
366
372
window_empire_show_checked ();
367
373
}
368
- static void button_mission_briefing (int param1, int param2) {
369
- if (!scenario_is_custom ())
370
- window_mission_briefing_show_review ();
371
- }
372
374
static void button_rotate_north (int param1, int param2) {
373
375
game_orientation_rotate_north ();
374
376
window_invalidate ();
0 commit comments