zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed bad merge in p_saveg.cpp

This commit is contained in:
Christoph Oelckers 2016-04-17 12:09:04 +02:00
parent dcc77e5fb2
commit 59133a7009
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/p_saveg.cpp
View File

@ -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();
}