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:
commit
194d0b8201
|
@ -266,6 +266,14 @@ void Y_LoadIntermissionData(void)
|
||||||
case int_ctf:
|
case int_ctf:
|
||||||
case int_teammatch:
|
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.redflag = (intertype == int_ctf) ? rflagico : rmatcico;
|
||||||
data.match.blueflag = (intertype == int_ctf) ? bflagico : bmatcico;
|
data.match.blueflag = (intertype == int_ctf) ? bflagico : bmatcico;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue