Only show briefing background if we have one, fixing arithmetic crash with SDL Video build

This commit is contained in:
kreatordxx 2010-03-24 13:59:42 +00:00
parent 1ff3f56c1c
commit 962a01cc5d
2 changed files with 3 additions and 1 deletions

View file

@ -3,6 +3,7 @@ D1X-Rebirth Changelog
20100324
--------
arch/include/event.h, arch/include/mouse.h, arch/sdl/mouse.c, main/kconfig.c, main/movie.c, main/newmenu.c, main/titles.c: Add EVENT_MOUSE_BUTTON_DOWN and EVENT_MOUSE_BUTTON_UP, use for all windows except game and editor. Fixes crash on iMac G5 when pressing keys to progress through briefing
main/titles.c: Only show briefing background if we have one (which we should always for Descent 1)
20100322
--------

View file

@ -1170,7 +1170,8 @@ int briefing_handler(window *wind, d_event *event, briefing *br)
break;
case EVENT_WINDOW_DRAW:
show_fullscr(&br->background);
if (br->background.bm_data)
show_fullscr(&br->background);
if (br->guy_bitmap_show)
show_briefing_bitmap(&br->guy_bitmap);