OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/zdoom/master'

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-17 12:06:26 +02:00
commit dcc77e5fb2
4 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/p_saveg.cpp
View file

@ -547,15 +547,7 @@ void P_SerializePolyobjs (FArchive &arc)
arc << seg << po_NumPolyobjs;
for(i = 0, po = polyobjs; i < po_NumPolyobjs; i++, po++)
{
arc << po->tag << po->Angle << po->StartSpot.pos << po->interpolation;
if (SaveVersion >= 4537)
{
arc << po->bBlocked;
}
else
{
po->bBlocked = false;
}
arc << po->tag << po->Angle << po->StartSpot.pos << po->interpolation << po->bBlocked;
}
}
else
@ -581,6 +573,15 @@ 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;
}
po->RotatePolyobj (angle, true);
delta -= po->StartSpot.pos;
po->MovePolyobj (delta, true);