zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-07 08:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed handling of missing backgrounds for intermission text screens for real this time.

Browse source 
SVN r3041 (trunk)
This commit is contained in:
Christoph Oelckers 2010-12-15 08:00:38 +00:00
parent e7eb43a343
commit 772d59dff4
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/intermission/intermission.cpp
View file

@ -110,8 +110,11 @@ void DIntermissionScreen::Init(FIntermissionAction *desc, bool first)
{ {
texname = GStrings[texname+1]; texname = GStrings[texname+1];
} }
mBackground = TexMan.CheckForTexture(texname, FTexture::TEX_MiscPatch); if (texname[0] != 0)
mFlatfill = desc->mFlatfill; {
mBackground = TexMan.CheckForTexture(texname, FTexture::TEX_MiscPatch);
mFlatfill = desc->mFlatfill;
}
S_Sound (CHAN_VOICE | CHAN_UI, desc->mSound, 1.0f, ATTN_NONE); S_Sound (CHAN_VOICE | CHAN_UI, desc->mSound, 1.0f, ATTN_NONE);
if (desc->mPalette.IsNotEmpty() && (lumpnum = Wads.CheckNumForFullName(desc->mPalette, true)) > 0) if (desc->mPalette.IsNotEmpty() && (lumpnum = Wads.CheckNumForFullName(desc->mPalette, true)) > 0)
{ {

10
src/intermission/intermission_parse.cpp
View file

@ -833,7 +833,15 @@ void F_StartFinale (const char *music, int musicorder, int cdtrack, unsigned int
textscreen->mText << '$' << text; textscreen->mText << '$' << text;
} }
textscreen->mTextDelay = 10; textscreen->mTextDelay = 10;
textscreen->mBackground = flat; if (flat != NULL && *flat != 0)
{
textscreen->mBackground = flat;
}
else
{
// force a black screen if no texture is set.
textscreen->mBackground = "-";
}
textscreen->mFlatfill = !finalePic; textscreen->mFlatfill = !finalePic;
if (music != NULL && *music != 0) if (music != NULL && *music != 0)