diff --git a/src/d_main.c b/src/d_main.c index 5a5ecb510..9443c0a47 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -364,16 +364,22 @@ gamestate_t wipegamestate = GS_LEVEL; static void D_MakeIntermissionBG(void) { - if (rendermode == render_none) - return; - if (!lastdraw) return; + if (rendermode == render_none) + { + lastdraw = false; + return; + } + // no more valid map // shouldnt happen at this point, but better safe than sorry! if (!numsectors) + { + lastdraw = false; return; + } // need to render level again for this // should be fine since at this point we did not unload it yet @@ -381,7 +387,6 @@ static void D_MakeIntermissionBG(void) { D_Renderview(); } - #ifdef HWRENDER if (rendermode == render_opengl) { diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index f458015ae..6e41a7d3b 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -254,11 +254,13 @@ static void CV_screentextures_OnChange(void) { if (cv_glpaletterendering.value != 0) CV_SetValue(&cv_glpaletterendering, 0); - #ifdef USE_FBO_OGL if (cv_glframebuffer.value != 0) CV_SetValue(&cv_glframebuffer, 0); #endif + // HACK: set lastdraw so intermission bg can refresh after toggling screentextures + if (gamestate == GS_INTERMISSION) + lastdraw = true; } GL_SetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_glscreentextures.value); M_UpdateOGLMenu(); diff --git a/src/screen.c b/src/screen.c index ebc5abddf..84e81617a 100644 --- a/src/screen.c +++ b/src/screen.c @@ -277,6 +277,10 @@ void SCR_Recalc(void) // vid.recalc lasts only for the next refresh... con_recalc = true; am_recalc = true; + + // HACK: set lastdraw so intermission bg can refresh after resolution change + if (gamestate == GS_INTERMISSION) + lastdraw = true; } // Check for screen cmd-line parms: to force a resolution.