From 70169c49213fbb9b2efa6d34361a38b43e1a93bd Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 19 Sep 2021 10:53:48 +0000 Subject: [PATCH] Compute briefing window dimensions from caller's canvas --- similar/main/titles.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/similar/main/titles.cpp b/similar/main/titles.cpp index 3c0e703d6..f0649db2e 100644 --- a/similar/main/titles.cpp +++ b/similar/main/titles.cpp @@ -492,7 +492,10 @@ public: struct briefing : window { - using window::window; + briefing(grs_canvas &src) : + window(src, 0, 0, src.cv_bitmap.bm_w, src.cv_bitmap.bm_h) + { + } virtual window_event_result event_handler(const d_event &) override; unsigned streamcount; short level_num; @@ -1598,8 +1601,7 @@ window_event_result briefing::event_handler(const d_event &event) case EVENT_WINDOW_DRAW: { - gr_set_default_canvas(); - auto &canvas = *grd_curcanv; + auto &canvas = w_canv; timer_delay2(50); @@ -1659,7 +1661,7 @@ void do_briefing_screens(const d_fname &filename, int level_num) if (!*static_cast(filename)) return; - auto br = window_create(grd_curscreen->sc_canvas, 0, 0, SWIDTH, SHEIGHT); + auto br = window_create(grd_curscreen->sc_canvas); briefing_init(br, level_num); if (!load_screen_text(filename, br->text))