stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-13 06:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'opengl-skipintro-sigabrt' into 'master'

Browse source 
Fix crash when using -skipintro and the renderer is set to OpenGL from config

See merge request STJr/SRB2!714
This commit is contained in:
James R 2020-01-31 02:34:08 -05:00
commit 6528b4a0f8
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/f_finale.c
View file

@ -2693,8 +2693,18 @@ static void F_FigureActiveTtScale(void)
SINT8 newttscale = max(1, min(6, vid.dupx)); SINT8 newttscale = max(1, min(6, vid.dupx));
SINT8 oldttscale = activettscale; SINT8 oldttscale = activettscale;
if (newttscale == testttscale) if (needpatchrecache)
return; ttloaded[0] = ttloaded[1] = ttloaded[2] = ttloaded[3] = ttloaded[4] = ttloaded[5] = 0;
else
{
if (newttscale == testttscale)
return;
// We have a new ttscale, so load gfx
if(oldttscale > 0)
F_UnloadAlacroixGraphics(oldttscale);
}
testttscale = newttscale; testttscale = newttscale;
// If ttscale is unavailable: look for lower scales, then higher scales. // If ttscale is unavailable: look for lower scales, then higher scales.
@ -2712,10 +2722,6 @@ static void F_FigureActiveTtScale(void)
activettscale = (newttscale >= 1 && newttscale <= 6) ? newttscale : 0; activettscale = (newttscale >= 1 && newttscale <= 6) ? newttscale : 0;
// We have a new ttscale, so load gfx
if(oldttscale > 0)
F_UnloadAlacroixGraphics(oldttscale);
if(activettscale > 0) if(activettscale > 0)
F_LoadAlacroixGraphics(activettscale); F_LoadAlacroixGraphics(activettscale);
} }
@ -2757,12 +2763,6 @@ void F_TitleScreenDrawer(void)
return; return;
#endif #endif
if (needpatchrecache && (curttmode == TTMODE_ALACROIX))
{
ttloaded[0] = ttloaded[1] = ttloaded[2] = ttloaded[3] = ttloaded[4] = ttloaded[5] = 0;
F_LoadAlacroixGraphics(activettscale);
}
switch(curttmode) switch(curttmode)
{ {
case TTMODE_OLD: case TTMODE_OLD: