zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 23:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-18 15:29:45 +02:00
commit 990f5a79b4
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/actor.h
View file

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

1
src/dthinker.h
View file

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

7
src/g_level.cpp
View file

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

11
src/p_mobj.cpp
View file

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