From 0657121847ade656974155459021977a3347d182 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 15 Aug 2010 14:09:17 +0000 Subject: [PATCH] - Backport from GZDoom: P_LoopSidedefs() needed another fix as it shouldn't try to report errors found on the second loop. SVN r2544 (trunk) --- src/p_setup.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 332e1d0774..35ec40a43f 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -2128,7 +2128,7 @@ static void P_AllocateSideDefs (int count) // [RH] Group sidedefs into loops so that we can easily determine // what walls any particular wall neighbors. -static void P_LoopSidedefs () +static void P_LoopSidedefs (bool firstloop) { int i; @@ -2193,7 +2193,7 @@ static void P_LoopSidedefs () right = sidetemp[right].b.first; - if (right == NO_SIDE) + if (firstloop && right == NO_SIDE) { // There is no right side! Printf ("Line %d's right edge is unconnected\n", linemap[unsigned(line-lines)]); continue; @@ -3655,7 +3655,7 @@ void P_SetupLevel (char *lumpname, int position) } times[6].Clock(); - P_LoopSidedefs (); + P_LoopSidedefs (true); times[6].Unclock(); linemap.Clear(); @@ -3845,9 +3845,7 @@ void P_SetupLevel (char *lumpname, int position) P_SpawnSpecials (); times[16].Clock(); - // The old sidedef looping data is no longer valid if the nodes were rebuilt - // and vertexes merged so it has to be redone before setting up the polyobjects. - if (ForceNodeBuild) P_LoopSidedefs (); + if (ForceNodeBuild) P_LoopSidedefs (false); PO_Init (); // Initialize the polyobjs times[16].Unclock();