- 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
|
|
@ -37,7 +37,7 @@
|
|||
#include "p_spec.h"
|
||||
#include "g_level.h"
|
||||
#include "s_sndseq.h"
|
||||
#include "farchive.h"
|
||||
#include "serializer.h"
|
||||
#include "r_data/r_interpolate.h"
|
||||
|
||||
IMPLEMENT_POINTY_CLASS (DPillar)
|
||||
|
|
@ -45,14 +45,6 @@ IMPLEMENT_POINTY_CLASS (DPillar)
|
|||
DECLARE_POINTER(m_Interp_Ceiling)
|
||||
END_POINTERS
|
||||
|
||||
inline FArchive &operator<< (FArchive &arc, DPillar::EPillar &type)
|
||||
{
|
||||
BYTE val = (BYTE)type;
|
||||
arc << val;
|
||||
type = (DPillar::EPillar)val;
|
||||
return arc;
|
||||
}
|
||||
|
||||
DPillar::DPillar ()
|
||||
{
|
||||
}
|
||||
|
|
@ -72,18 +64,18 @@ void DPillar::Destroy()
|
|||
Super::Destroy();
|
||||
}
|
||||
|
||||
void DPillar::Serialize(FArchive &arc)
|
||||
void DPillar::Serialize(FSerializer &arc)
|
||||
{
|
||||
Super::Serialize (arc);
|
||||
arc << m_Type
|
||||
<< m_FloorSpeed
|
||||
<< m_CeilingSpeed
|
||||
<< m_FloorTarget
|
||||
<< m_CeilingTarget
|
||||
<< m_Crush
|
||||
<< m_Hexencrush
|
||||
<< m_Interp_Floor
|
||||
<< m_Interp_Ceiling;
|
||||
arc.Enum("type", m_Type)
|
||||
("floorspeed", m_FloorSpeed)
|
||||
("ceilingspeed", m_CeilingSpeed)
|
||||
("floortarget", m_FloorTarget)
|
||||
("ceilingtarget", m_CeilingTarget)
|
||||
("crush", m_Crush)
|
||||
("hexencrush", m_Hexencrush)
|
||||
("interp_floor", m_Interp_Floor)
|
||||
("interp_ceiling", m_Interp_Ceiling);
|
||||
}
|
||||
|
||||
void DPillar::Tick ()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue