fix: update draw_foreground function to use new context in orders

what:
   fix: update draw_warehouse_orders function to use new object_info struct members
   refactor: make is_advisor_available function accessible outside of file

Author: s.kushnirenko

src/building/storage_yard.cpp

@@ -889,11 +889,14 @@ void building_storage_yard::spawn_figure() {
 }
 
 void building_storage_yard::draw_warehouse_orders(object_info* c) {
-    int y_offset = window_building_get_vertical_offset(c, 28 + 5);
     c->help_id = 4;
-    outer_panel_draw(vec2i{c->offset.x, y_offset}, 29, 28 + 5);
-    lang_text_draw_centered(99, 3, c->offset.x, y_offset + 10, 16 * c->width_blocks, FONT_LARGE_BLACK_ON_LIGHT);
-    inner_panel_draw(c->offset.x + 16, y_offset + 42, c->width_blocks - 2, 21 + 5);
+    c->subwnd_wblocks_num = 29;
+    c->subwnd_hblocks_num = 33;
+    int y_pos = window_building_get_vertical_offset(c, c->subwnd_hblocks_num);
+    c->subwnd_y_offset = y_pos - c->offset.y;
+    outer_panel_draw(vec2i{c->offset.x, y_pos}, c->subwnd_wblocks_num, c->subwnd_hblocks_num);
+    lang_text_draw_centered(99, 3, c->offset.x, y_pos + 10, 16 * c->width_blocks, FONT_LARGE_BLACK_ON_LIGHT);
+    inner_panel_draw(c->offset.x + 16, y_pos + 42, c->width_blocks - 2, 21 + 5);
 }
 
 void building_storage_yard::draw_warehouse(object_info* c) {

src/city/object_info.h

@@ -48,6 +48,9 @@ struct object_info {
     int width_blocks;
     int height_blocks;
     int height_blocks_submenu;
+    int subwnd_wblocks_num;
+    int subwnd_hblocks_num;
+    int subwnd_y_offset;
     int help_id;
     bool can_play_sound;
     int building_id;

src/window/advisors.cpp

@@ -141,7 +141,7 @@ static void set_advisor(int advisor) {
     advisor_buttons[advisor - 1].pressed = 1; // set button active when coming back to menu
 }
 
-static bool is_advisor_available(int btn_id) {
+bool is_advisor_available(int btn_id) {
     return (mission_advisor_availability((e_advisor)btn_id, scenario_campaign_scenario_id() + 1) == AVAILABLE);
 }
 

src/window/advisors.h

@@ -15,7 +15,7 @@ struct advisor_window_type {
 };
 
 int window_advisors_get_advisor(void);
-
+bool is_advisor_available(int btn_id);
 void window_advisors_draw_dialog_background(void);
 
 void window_advisors_show(void);

src/window/window_building_info.cpp

@@ -745,7 +745,7 @@ static void draw_foreground() {
     }
 
     // general buttons
-    int y_offset = (context.storage_show_special_orders) ? context.y_offset_submenu : 0;
+    int y_offset = (context.storage_show_special_orders) ? context.subwnd_y_offset : 0;
     int height_blocks = (context.storage_show_special_orders) ? context.height_blocks_submenu : context.height_blocks;
 
     ui::img_button(GROUP_CONTEXT_ICONS, vec2i(14, y_offset + 16 * height_blocks - 40), {28, 28}, 0)
@@ -769,31 +769,31 @@ static void draw_foreground() {
                     }
                });
 
-    if (context.go_to_advisor.first) {
+    if (!context.storage_show_special_orders && context.go_to_advisor.first && is_advisor_available(context.go_to_advisor.first)) {
         int img_offset = (context.go_to_advisor.left_a - 1) * 3;
         ui::img_button(GROUP_MESSAGE_ADVISOR_BUTTONS, vec2i(40, 16 * context.height_blocks - 40), {28, 28}, img_offset)
                .onclick([&context] (int, int) {
                    window_advisors_show_advisor(context.go_to_advisor.first);
                });
     }
 
-    if (context.go_to_advisor.left_a) {
+    if (!context.storage_show_special_orders && context.go_to_advisor.left_a && is_advisor_available(context.go_to_advisor.left_a)) {
         int img_offset = (context.go_to_advisor.left_a - 1) * 3;
         ui::img_button(GROUP_MESSAGE_ADVISOR_BUTTONS, vec2i(40, 16 * context.height_blocks - 40), {28, 28}, img_offset)
                .onclick([&context] (int, int) {
                    window_advisors_show_advisor(context.go_to_advisor.left_a);
                });
     }
 
-    if (context.go_to_advisor.left_b) {
+    if (!context.storage_show_special_orders && context.go_to_advisor.left_b && is_advisor_available(context.go_to_advisor.left_b)) {
         int img_offset = (context.go_to_advisor.left_b - 1) * 3;
         ui::img_button(GROUP_MESSAGE_ADVISOR_BUTTONS, vec2i(65, 16 * context.height_blocks - 40), {28, 28}, img_offset)
                .onclick([&context] (int, int) {
                    window_advisors_show_advisor(context.go_to_advisor.left_b);
                });
     }
 
-    if (b) {
+    if (!context.storage_show_special_orders && b) {
         int workers_needed = model_get_building(b->type)->laborers;
         if (workers_needed) {
             pcstr label = (b->state == BUILDING_STATE_VALID ? "x" : "");
@@ -809,7 +809,7 @@ static void draw_foreground() {
         }
     }
 
-    if (context.figure.draw_debug_path) {
+    if (!context.storage_show_special_orders && context.figure.draw_debug_path) {
         figure* f = figure_get(context.figure.figure_ids[0]);
         pcstr label = (f->draw_debug_mode ? "P" : "p");
         ui::button(label, {400, 3 + 16 * context.height_blocks - 40}, {20, 20})
@@ -819,7 +819,7 @@ static void draw_foreground() {
               });
     }
 
-    if (context.show_overlay != OVERLAY_NONE) {
+    if (!context.storage_show_special_orders && context.show_overlay != OVERLAY_NONE) {
         pcstr label = (game_state_overlay() != context.show_overlay ? "v" : "V");
         ui::button(label, {375, 3 + 16 * context.height_blocks - 40}, {20, 20})
              .onclick([&context] (int, int) {
@@ -831,7 +831,6 @@ static void draw_foreground() {
                 window_invalidate();
              });
     }
-
 }
 
 static int handle_specific_building_info_mouse(const mouse *m) {