- most thinkers are done. Some stuff about polyobject pointers is temporarily disabled right now because some of the required functions have already been pulled out.
This commit is contained in:
parent
340c7795f3
commit
e89d072abc
39 changed files with 290 additions and 342 deletions
|
|
@ -28,7 +28,7 @@
|
|||
#include "nodebuild.h"
|
||||
#include "p_terrain.h"
|
||||
#include "po_man.h"
|
||||
#include "farchive.h"
|
||||
#include "serializer.h"
|
||||
#include "r_utility.h"
|
||||
#include "a_sharedglobal.h"
|
||||
#include "p_local.h"
|
||||
|
|
@ -1053,14 +1053,14 @@ double sector_t::NextLowestFloorAt(double x, double y, double z, int flags, doub
|
|||
//
|
||||
//===========================================================================
|
||||
|
||||
FArchive &operator<< (FArchive &arc, secspecial_t &p)
|
||||
{
|
||||
arc << p.special
|
||||
<< p.damageamount
|
||||
<< p.damagetype
|
||||
<< p.damageinterval
|
||||
<< p.leakydamage
|
||||
<< p.Flags;
|
||||
FSerializer &Serialize(FSerializer &arc, const char *key, secspecial_t &spec, secspecial_t *def)
|
||||
{
|
||||
arc("special", spec.special)
|
||||
("damageamount", spec.damageamount)
|
||||
("damagetype", spec.damagetype)
|
||||
("damageinterval", spec.damageinterval)
|
||||
("leakydamage", spec.leakydamage)
|
||||
("flags", spec.Flags);
|
||||
return arc;
|
||||
}
|
||||
|
||||
|
|
@ -1101,17 +1101,6 @@ bool secplane_t::CopyPlaneIfValid (secplane_t *dest, const secplane_t *opp) cons
|
|||
return copy;
|
||||
}
|
||||
|
||||
FArchive &operator<< (FArchive &arc, secplane_t &plane)
|
||||
{
|
||||
arc << plane.normal << plane.D;
|
||||
if (plane.normal.Z != 0)
|
||||
{ // plane.c should always be non-0. Otherwise, the plane
|
||||
// would be perfectly vertical. (But then, don't let this crash on a broken savegame...)
|
||||
plane.negiC = -1 / plane.normal.Z;
|
||||
}
|
||||
return arc;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// P_AlignFlat
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue