From 355b7db6034a67cc103cde8daecbfe3308ea2ec3 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Fri, 15 Jul 2011 11:24:53 +0000
Subject: [PATCH] - remove savegame compatibility handling code.

SVN r3273 (savegamefix)
---
 src/g_shared/a_lightning.cpp | 20 -------------------
 src/p_mobj.cpp               | 37 ++++++++++++------------------------
 src/p_saveg.cpp              | 15 +++------------
 src/p_spec.cpp               | 24 ++---------------------
 4 files changed, 17 insertions(+), 79 deletions(-)

diff --git a/src/g_shared/a_lightning.cpp b/src/g_shared/a_lightning.cpp
index e7c598d3e8..80e83e1e4c 100644
--- a/src/g_shared/a_lightning.cpp
+++ b/src/g_shared/a_lightning.cpp
@@ -44,26 +44,6 @@ void DLightningThinker::Serialize (FArchive &arc)
 
 	arc << Stopped << NextLightningFlash << LightningFlashCount;
 
-	if (SaveVersion < 3243)
-	{ 
-		// Do nothing with old savegames and just keep whatever the constructor made
-		// but read the obsolete data from the savegame 
-		for (i = (numsectors + (numsectors+7)/8); i > 0; --i)
-		{
-			if (SaveVersion < 3223)
-			{
-				BYTE bytelight;
-				arc << bytelight;
-			}
-			else
-			{
-				short shortlight;
-				arc << shortlight;
-			}
-		}
-		return;
-	}
-
 	if (arc.IsLoading ())
 	{
 		if (LightningLightLevels != NULL)
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 36339ffeea..0cc3e6d24e 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -230,12 +230,9 @@ void AActor::Serialize (FArchive &arc)
 		<< velz
 		<< tics
 		<< state
-		<< Damage;
-	if (SaveVersion >= 3227)
-	{
-		arc << projectileKickback;
-	}
-	arc	<< flags
+		<< Damage
+		<< projectileKickback
+		<< flags
 		<< flags2
 		<< flags3
 		<< flags4
@@ -297,14 +294,10 @@ void AActor::Serialize (FArchive &arc)
 		<< maxtargetrange
 		<< meleethreshold
 		<< meleerange
-		<< DamageType;
-	if (SaveVersion >= 3237) 
-	{
-		arc
+		<< DamageType
 		<< PainType
-		<< DeathType;
-	}
-	arc	<< gravity
+		<< DeathType
+		<< gravity
 		<< FastChaseStrafeCount
 		<< master
 		<< smokecounter
@@ -312,22 +305,16 @@ void AActor::Serialize (FArchive &arc)
 		<< BlockingLine
 		<< pushfactor
 		<< Species
-		<< Score;
-	if (SaveVersion >= 3113)
-	{
-		arc << DesignatedTeam;
-	}
-	arc << lastpush << lastbump
+		<< Score
+		<< DesignatedTeam
+		<< lastpush << lastbump
 		<< PainThreshold
 		<< DamageFactor
 		<< WeaveIndexXY << WeaveIndexZ
 		<< PoisonDamageReceived << PoisonDurationReceived << PoisonPeriodReceived << Poisoner
-		<< PoisonDamage << PoisonDuration << PoisonPeriod;
-	if (SaveVersion >= 3235)
-	{
-		arc << PoisonDamageType << PoisonDamageTypeReceived;
-	}
-	arc << ConversationRoot << Conversation;
+		<< PoisonDamage << PoisonDuration << PoisonPeriod
+		<< PoisonDamageType << PoisonDamageTypeReceived
+		<< ConversationRoot << Conversation;
 
 	{
 		FString tagstr;
diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp
index 741887cabe..5d2b180819 100644
--- a/src/p_saveg.cpp
+++ b/src/p_saveg.cpp
@@ -322,18 +322,9 @@ void P_SerializeWorld (FArchive &arc)
 	for (i = 0, sec = sectors; i < numsectors; i++, sec++)
 	{
 		arc << sec->floorplane
-			<< sec->ceilingplane;
-		if (SaveVersion < 3223)
-		{
-			BYTE bytelight;
-			arc << bytelight;
-			sec->lightlevel = bytelight;
-		}
-		else
-		{
-			arc << sec->lightlevel;
-		}
-		arc << sec->special
+			<< sec->ceilingplane
+			<< sec->lightlevel
+			<< sec->special
 			<< sec->tag
 			<< sec->soundtraversed
 			<< sec->seqType
diff --git a/src/p_spec.cpp b/src/p_spec.cpp
index d73575bea5..bc1c90ccbd 100644
--- a/src/p_spec.cpp
+++ b/src/p_spec.cpp
@@ -724,17 +724,7 @@ IMPLEMENT_CLASS (DLightTransfer)
 void DLightTransfer::Serialize (FArchive &arc)
 {
 	Super::Serialize (arc);
-	if (SaveVersion < 3223)
-	{
-		BYTE bytelight;
-		arc << bytelight;
-		LastLight = bytelight;
-	}
-	else
-	{
-		arc << LastLight;
-	}
-	arc << Source << TargetTag << CopyFloor;
+	arc << LastLight << Source << TargetTag << CopyFloor;
 }
 
 DLightTransfer::DLightTransfer (sector_t *srcSec, int target, bool copyFloor)
@@ -817,17 +807,7 @@ IMPLEMENT_CLASS (DWallLightTransfer)
 void DWallLightTransfer::Serialize (FArchive &arc)
 {
 	Super::Serialize (arc);
-	if (SaveVersion < 3223)
-	{
-		BYTE bytelight;
-		arc << bytelight;
-		LastLight = bytelight;
-	}
-	else
-	{
-		arc << LastLight;
-	}
-	arc << Source << TargetID << Flags;
+	arc << LastLight << Source << TargetID << Flags;
 }
 
 DWallLightTransfer::DWallLightTransfer (sector_t *srcSec, int target, BYTE flags)