TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compute briefing window dimensions from caller's canvas

Browse source
This commit is contained in:
Kp 2021-09-19 10:53:48 +00:00
parent 4d11ad18a6
commit 70169c4921
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
similar/main/titles.cpp
View file

@ -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<const char *>(filename))
return;
auto br = window_create<briefing>(grd_curscreen->sc_canvas, 0, 0, SWIDTH, SHEIGHT);
auto br = window_create<briefing>(grd_curscreen->sc_canvas);
briefing_init(br, level_num);
if (!load_screen_text(filename, br->text))