lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'interfission' into 'next' 

Cache teamflags/icons before drawing if they don't exist yet (closes #511)

Closes #511

See merge request STJr/SRB2!1459
This commit is contained in:
sphere 2021-04-19 14:33:23 -04:00
parent 315582bd6c 7b83345c75
commit 194d0b8201
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/y_inter.c
View File

@ -266,6 +266,14 @@ void Y_LoadIntermissionData(void)
case int_ctf:
case int_teammatch:
{
if (!rflagico) //prevent a crash if we haven't cached our team graphics yet
{
rflagico = W_CachePatchName("RFLAGICO", PU_HUDGFX);
bflagico = W_CachePatchName("BFLAGICO", PU_HUDGFX);
rmatcico = W_CachePatchName("RMATCICO", PU_HUDGFX);
bmatcico = W_CachePatchName("BMATCICO", PU_HUDGFX);
}
data.match.redflag = (intertype == int_ctf) ? rflagico : rmatcico;
data.match.blueflag = (intertype == int_ctf) ? bflagico : bmatcico;
}