- fixed last commit. This was missing an init call for the portal data.

This commit is contained in:
Christoph Oelckers 2018-04-02 00:14:53 +02:00
parent 248a29bf06
commit 64b504ee7f
5 changed files with 4 additions and 16 deletions

View file

@ -107,6 +107,7 @@ struct FCoverageBuilder
//========================================================================== //==========================================================================
// //
// //
//
//========================================================================== //==========================================================================
FCoverageBuilder(subsector_t *sub) FCoverageBuilder(subsector_t *sub)
@ -477,7 +478,6 @@ static void GroupLinePortals()
{ {
level.linePortals[i].mGroup = &level.linePortalSpans[tempindex[i]]; level.linePortals[i].mGroup = &level.linePortalSpans[tempindex[i]];
} }
} }
void InitPortalGroups() void InitPortalGroups()

View file

@ -1,9 +0,0 @@
#ifndef __GL_FUNCT
#define __GL_FUNCT
#include "v_palette.h"
class AActor;
#endif

View file

@ -42,6 +42,7 @@
#include "po_man.h" #include "po_man.h"
#include "r_utility.h" #include "r_utility.h"
#include "p_local.h" #include "p_local.h"
#include "gl/gl_functions.h"
#include "serializer.h" #include "serializer.h"
#include "g_levellocals.h" #include "g_levellocals.h"
#include "events.h" #include "events.h"
@ -1037,10 +1038,6 @@ void FGLInterface::StartSerialize(FSerializer &arc)
void FGLInterface::EndSerialize(FSerializer &arc) void FGLInterface::EndSerialize(FSerializer &arc)
{ {
if (arc.isReading())
{
// The portal data needs to be recreated after reading a savegame.
}
} }
//=========================================================================== //===========================================================================
@ -1150,7 +1147,6 @@ void FGLInterface::RenderTextureView (FCanvasTexture *tex, AActor *Viewpoint, do
// //
// //
//=========================================================================== //===========================================================================
void gl_PreprocessLevel();
void FGLInterface::PreprocessLevel() void FGLInterface::PreprocessLevel()
{ {

View file

@ -134,7 +134,7 @@ void GLWall::SkyPlane(sector_t *sector, int plane, bool allowreflect)
case PORTS_PORTAL: case PORTS_PORTAL:
case PORTS_LINKEDPORTAL: case PORTS_LINKEDPORTAL:
{ {
FSectorPortalGroup *glport = sector->GetPortalGroup(plane); auto glport = sector->GetPortalGroup(plane);
if (glport != NULL) if (glport != NULL)
{ {
if (sector->PortalBlocksView(plane)) return; if (sector->PortalBlocksView(plane)) return;

View file

@ -4122,6 +4122,7 @@ void P_SetupLevel (const char *lumpname, int position)
// This must be done BEFORE the PolyObj Spawn!!! // This must be done BEFORE the PolyObj Spawn!!!
Renderer->PreprocessLevel(); Renderer->PreprocessLevel();
InitPortalGroups();
times[16].Clock(); times[16].Clock();
if (reloop) P_LoopSidedefs (false); if (reloop) P_LoopSidedefs (false);