From c9a33edee040bf77e77c91f76ebdcb305892a4b7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 9 Dec 2010 07:55:46 +0000 Subject: [PATCH] - fixed: Portal setup did some incorrect validity checks. SVN r3025 (trunk) --- src/p_spec.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_spec.cpp b/src/p_spec.cpp index a2e09d347..dd3e0ca11 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -867,7 +867,7 @@ static void SetupFloorPortal (AStackPoint *point) NActorIterator it (NAME_LowerStackLookOnly, point->tid); sector_t *Sector = point->Sector; Sector->FloorSkyBox = static_cast(it.Next()); - if (Sector->FloorSkyBox != NULL || !Sector->FloorSkyBox->bAlways) + if (Sector->FloorSkyBox != NULL && Sector->FloorSkyBox->bAlways) { Sector->FloorSkyBox->Mate = point; if (Sector->GetAlpha(sector_t::floor) == OPAQUE) @@ -880,7 +880,7 @@ static void SetupCeilingPortal (AStackPoint *point) NActorIterator it (NAME_UpperStackLookOnly, point->tid); sector_t *Sector = point->Sector; Sector->CeilingSkyBox = static_cast(it.Next()); - if (Sector->CeilingSkyBox != NULL || !Sector->CeilingSkyBox->bAlways) + if (Sector->CeilingSkyBox != NULL && Sector->CeilingSkyBox->bAlways) { Sector->CeilingSkyBox->Mate = point; if (Sector->GetAlpha(sector_t::ceiling) == OPAQUE)