From 59133a70093c6eeddd975bb3a6f39399fe79842a Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 17 Apr 2016 12:09:04 +0200
Subject: [PATCH] - fixed bad merge in p_saveg.cpp

---
 src/p_saveg.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp
index 308a3a26a..e8703dde1 100644
--- a/src/p_saveg.cpp
+++ b/src/p_saveg.cpp
@@ -341,7 +341,7 @@ void P_SerializeWorld (FArchive &arc)
 	{
 		arc << sec->floorplane
 			<< sec->ceilingplane;
-			arc << sec->lightlevel;
+		arc << sec->lightlevel;
 		arc << sec->special;
 		arc << sec->soundtraversed
 			<< sec->seqType
@@ -358,12 +358,12 @@ void P_SerializeWorld (FArchive &arc)
 			<< sec->heightsec
 			<< sec->bottommap << sec->midmap << sec->topmap
 			<< sec->gravity;
-			P_SerializeTerrain(arc, sec->terrainnum[0]);
-			P_SerializeTerrain(arc, sec->terrainnum[1]);
-			arc << sec->damageamount;
-			arc << sec->damageinterval
-				<< sec->leakydamage
-				<< sec->damagetype;
+		P_SerializeTerrain(arc, sec->terrainnum[0]);
+		P_SerializeTerrain(arc, sec->terrainnum[1]);
+		arc << sec->damageamount;
+		arc << sec->damageinterval
+			<< sec->leakydamage
+			<< sec->damagetype;
 		arc << sec->SoundTarget
 			<< sec->SecActTarget
 			<< sec->sky
@@ -417,10 +417,7 @@ void P_SerializeWorld (FArchive &arc)
 		arc << li->args[1] << li->args[2] << li->args[3] << li->args[4];
 
 			arc << li->portalindex;
-		if (SaveVersion >= 4531)
-		{
-			arc << li->skybox;
-		}
+			arc << li->skybox;	// GZDoom addition.
 
 		for (j = 0; j < 2; j++)
 		{
@@ -457,7 +454,7 @@ void P_SerializeWorld (FArchive &arc)
 		arc << zn->Environment;
 	}
 
-		arc << linePortals;
+	arc << linePortals;
 	P_CollectLinkedPortals();
 }