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

Ensure cached cockpit textures are valid

Browse source 
Check if the cockpit window textures are still valid when reusing the
previous cockpit data in cockpit_decode_alpha.

This fixes a crash when leaving the graphics options menu while in
the game with cockpit visible, since that calls
ogl_smash_texture_list_internal which invalidates all textures.
This commit is contained in:
Arne de Bruijn 2020-08-28 14:58:37 +02:00
parent 0b141ea122
commit 5b56ed1970
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
similar/main/gauges.cpp
View file

@ -1990,7 +1990,18 @@ static void cockpit_decode_alpha(const hud_draw_context_mr hudctx, grs_bitmap *c
const unsigned bm_w = bm->bm_w;
// check if we processed this bitmap already
if (cur == bm->bm_data && cur_w == bm_w && cur_h == bm_h)
{
#if DXX_USE_OGL
// check if textures are still valid
if (WinBoxOverlay[0].get()->gltexture &&
WinBoxOverlay[0].get()->gltexture->handle &&
WinBoxOverlay[1].get()->gltexture &&
WinBoxOverlay[1].get()->gltexture->handle)
return;
#else
return;
#endif
}
RAIIdmem<uint8_t[]> cockpitbuf;
MALLOC(cockpitbuf, uint8_t[], DXX_MAX_COCKPIT_BITMAP_SIZE);