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

This commit is contained in:
Christoph Oelckers 2016-05-03 19:46:09 +02:00
parent 0f8f08edfd be3b126f7b
commit 4ea3339e40
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/g_shared/a_skies.cpp
View File

@ -126,12 +126,15 @@ void ASkyPicker::PostBeginPlay ()
else else
{ {
int boxindex = P_GetSkyboxPortal(box); int boxindex = P_GetSkyboxPortal(box);
// Do not override special portal types, only regular skies.
if (0 == (args[1] & 2)) if (0 == (args[1] & 2))
{ {
if (Sector->GetPortalType(sector_t::ceiling) == PORTS_SKYVIEWPOINT)
Sector->Portals[sector_t::ceiling] = boxindex; Sector->Portals[sector_t::ceiling] = boxindex;
} }
if (0 == (args[1] & 1)) if (0 == (args[1] & 1))
{ {
if (Sector->GetPortalType(sector_t::floor) == PORTS_SKYVIEWPOINT)
Sector->Portals[sector_t::floor] = boxindex; Sector->Portals[sector_t::floor] = boxindex;
} }
} }