zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom into zscript

This commit is contained in:
Christoph Oelckers 2016-10-22 10:15:52 +02:00
parent 43aec68559 853e49a077
commit 38fa26af75
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/r_sky.cpp
View File

@ -76,10 +76,20 @@ void R_InitSkyMap ()
int skyheight; int skyheight;
FTexture *skytex1, *skytex2; FTexture *skytex1, *skytex2;
// Do not allow the null texture which has no bitmap and will crash.
if (sky1texture.isNull())
{
sky1texture = TexMan.CheckForTexture("-noflat-", FTexture::TEX_Any);
}
if (sky2texture.isNull())
{
sky2texture = TexMan.CheckForTexture("-noflat-", FTexture::TEX_Any);
}
skytex1 = TexMan(sky1texture, true); skytex1 = TexMan(sky1texture, true);
skytex2 = TexMan(sky2texture, true); skytex2 = TexMan(sky2texture, true);
if (skytex1 == NULL) if (skytex1 == nullptr)
return; return;
if ((level.flags & LEVEL_DOUBLESKY) && skytex1->GetHeight() != skytex2->GetHeight()) if ((level.flags & LEVEL_DOUBLESKY) && skytex1->GetHeight() != skytex2->GetHeight())