Merge branch 'master' of https://github.com/rheit/zdoom

src/actor.h

@@ -576,6 +576,7 @@ public:
 	~AActor ();
 
 	void Serialize (FArchive &arc);
+	void PostSerialize();
 
 	static AActor *StaticSpawn (PClassActor *type, const DVector3 &pos, replace_t allowreplacement, bool SpawningMapThing = false);
 

src/dthinker.h

@@ -69,6 +69,7 @@ public:
 	virtual ~DThinker ();
 	virtual void Tick ();
 	virtual void PostBeginPlay ();	// Called just before the first tick
+	virtual void PostSerialize() {}
 	size_t PropagateMark();
 	
 	void ChangeStatNum (int statnum);

src/g_level.cpp

@@ -1582,6 +1582,13 @@ void G_SerializeLevel (FArchive &arc, bool hubLoad)
 	P_SerializeSounds (arc);
 	if (arc.IsLoading())
 	{
+		FThinkerIterator it(RUNTIME_CLASS(DThinker));
+		DThinker *th;
+		while ((th = it.Next()))
+		{
+			th->PostSerialize();
+		}
+
 		for (i = 0; i < numsectors; i++)
 		{
 			P_Recalculate3DFloors(&sectors[i]);

src/p_mobj.cpp

@@ -397,8 +397,6 @@ void AActor::Serialize(FArchive &arc)
 
 	if (arc.IsLoading ())
 	{
-		touching_sectorlist = NULL;
-		LinkToWorld (false, Sector);
 		AddToHash ();
 		SetShade (fillcolor);
 		if (player)
@@ -415,11 +413,16 @@ void AActor::Serialize(FArchive &arc)
 				Speed = GetDefault()->Speed;
 			}
 		}
-		ClearInterpolation();
-		UpdateWaterLevel(false);
 	}
 }
 
+void AActor::PostSerialize()
+{
+	touching_sectorlist = NULL;
+	LinkToWorld(false, Sector);
+	ClearInterpolation();
+	UpdateWaterLevel(false);
+}
 
 AActor::AActor () throw()
 {