OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source 
# Conflicts:
#	src/p_spec.cpp
#	src/r_bsp.cpp
#	src/r_defs.h
This commit is contained in:
Christoph Oelckers 2016-04-20 19:56:07 +02:00
commit 9c6e7753d8
29 changed files with 435 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/p_saveg.cpp
View file

@ -363,13 +363,11 @@ void P_SerializeWorld (FArchive &arc)
arc << sec->damageamount;
arc << sec->damageinterval
<< sec->leakydamage
<< sec->damagetype;
arc << sec->SoundTarget
<< sec->SecActTarget
<< sec->damagetype
<< sec->sky
<< sec->MoreFlags
<< sec->Flags
<< sec->SkyBoxes[sector_t::floor] << sec->SkyBoxes[sector_t::ceiling]
<< sec->Portals[sector_t::floor] << sec->Portals[sector_t::ceiling]
<< sec->ZoneNumber;
arc << sec->interpolations[0]
<< sec->interpolations[1]
@ -454,10 +452,26 @@ void P_SerializeWorld (FArchive &arc)
arc << zn->Environment;
}
arc << linePortals;
arc << linePortals << sectorPortals;
P_CollectLinkedPortals();
}
void P_SerializeWorldActors(FArchive &arc)
{
int i, j;
sector_t *sec;
for (i = 0, sec = sectors; i < numsectors; i++, sec++)
{
arc << sec->SoundTarget
<< sec->SecActTarget;
}
for (auto &s : sectorPortals)
{
arc << s.mSkybox;
}
}
void extsector_t::Serialize(FArchive &arc)
{
arc << FakeFloor.Sectors
@ -570,22 +584,8 @@ void P_SerializePolyobjs (FArchive &arc)
I_Error ("UnarchivePolyobjs: Invalid polyobj tag");
}
arc << angle << delta << po->interpolation;
if (SaveVersion >= 4537)
{
arc << po->bBlocked;
}
else
{
po->bBlocked = false;
}
if (SaveVersion >= 4538)
{
arc << po->bHasPortals;
}
else
{
po->bHasPortals = 0;
}
arc << po->bBlocked;
arc << po->bHasPortals;
po->RotatePolyobj (angle, true);
delta -= po->StartSpot.pos;