- fixed: Order of skybox and portal initialization was not well defined. It was always the last item to get initialized that got set. Changed it so that skyboxes cannot override portals at all.

This commit is contained in:
Christoph Oelckers 2016-05-03 19:42:53 +02:00
parent a576243ff2
commit be3b126f7b

View file

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