OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- 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.

Browse source
This commit is contained in:
Christoph Oelckers 2016-09-19 19:14:30 +02:00
commit e89d072abc
39 changed files with 290 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/p_lights.cpp
View file

@ -35,7 +35,7 @@
// State.
#include "r_state.h"
#include "statnums.h"
#include "farchive.h"
#include "serializer.h"
static FRandom pr_flicker ("Flicker");
static FRandom pr_lightflash ("LightFlash");
@ -49,7 +49,7 @@ class DFireFlicker : public DLighting
public:
DFireFlicker(sector_t *sector);
DFireFlicker(sector_t *sector, int upper, int lower);
void Serialize(FArchive &arc);
void Serialize(FSerializer &arc);
void Tick();
protected:
int m_Count;
@ -64,7 +64,7 @@ class DFlicker : public DLighting
DECLARE_CLASS(DFlicker, DLighting)
public:
DFlicker(sector_t *sector, int upper, int lower);
void Serialize(FArchive &arc);
void Serialize(FSerializer &arc);
void Tick();
protected:
int m_Count;
@ -80,7 +80,7 @@ class DLightFlash : public DLighting
public:
DLightFlash(sector_t *sector);
DLightFlash(sector_t *sector, int min, int max);
void Serialize(FArchive &arc);
void Serialize(FSerializer &arc);
void Tick();
protected:
int m_Count;
@ -98,7 +98,7 @@ class DStrobe : public DLighting
public:
DStrobe(sector_t *sector, int utics, int ltics, bool inSync);
DStrobe(sector_t *sector, int upper, int lower, int utics, int ltics);
void Serialize(FArchive &arc);
void Serialize(FSerializer &arc);
void Tick();
protected:
int m_Count;
@ -115,7 +115,7 @@ class DGlow : public DLighting
DECLARE_CLASS(DGlow, DLighting)
public:
DGlow(sector_t *sector);
void Serialize(FArchive &arc);
void Serialize(FSerializer &arc);
void Tick();
protected:
int m_MinLight;
@ -131,7 +131,7 @@ class DGlow2 : public DLighting
DECLARE_CLASS(DGlow2, DLighting)
public:
DGlow2(sector_t *sector, int start, int end, int tics, bool oneshot);
void Serialize(FArchive &arc);
void Serialize(FSerializer &arc);
void Tick();
protected:
int m_Start;
@ -150,7 +150,7 @@ class DPhased : public DLighting
public:
DPhased(sector_t *sector);
DPhased(sector_t *sector, int baselevel, int phase);
void Serialize(FArchive &arc);
void Serialize(FSerializer &arc);
void Tick();
protected:
BYTE m_BaseLevel;
@ -197,10 +197,12 @@ DFireFlicker::DFireFlicker ()
{
}
void DFireFlicker::Serialize(FArchive &arc)
void DFireFlicker::Serialize(FSerializer &arc)
{
Super::Serialize (arc);
arc << m_Count << m_MaxLight << m_MinLight;
arc("count", m_Count)
("maxlight", m_MaxLight)
("minlight", m_MinLight);
}
@ -262,10 +264,12 @@ DFlicker::DFlicker ()
{
}
void DFlicker::Serialize(FArchive &arc)
void DFlicker::Serialize(FSerializer &arc)
{
Super::Serialize (arc);
arc << m_Count << m_MaxLight << m_MinLight;
arc("count", m_Count)
("maxlight", m_MaxLight)
("minlight", m_MinLight);
}
//-----------------------------------------------------------------------------
@ -336,10 +340,14 @@ DLightFlash::DLightFlash ()
{
}
void DLightFlash::Serialize(FArchive &arc)
void DLightFlash::Serialize(FSerializer &arc)
{
Super::Serialize (arc);
arc << m_Count << m_MaxLight << m_MaxTime << m_MinLight << m_MinTime;
arc("count", m_Count)
("maxlight", m_MaxLight)
("minlight", m_MinLight)
("maxtime", m_MaxTime)
("mintime", m_MinTime);
}
//-----------------------------------------------------------------------------
@ -407,10 +415,14 @@ DStrobe::DStrobe ()
{
}
void DStrobe::Serialize(FArchive &arc)
void DStrobe::Serialize(FSerializer &arc)
{
Super::Serialize (arc);
arc << m_Count << m_MaxLight << m_MinLight << m_DarkTime << m_BrightTime;
arc("count", m_Count)
("maxlight", m_MaxLight)
("minlight", m_MinLight)
("darktime", m_DarkTime)
("brighttime", m_BrightTime);
}
//-----------------------------------------------------------------------------
@ -661,10 +673,12 @@ DGlow::DGlow ()
{
}
void DGlow::Serialize(FArchive &arc)
void DGlow::Serialize(FSerializer &arc)
{
Super::Serialize (arc);
arc << m_Direction << m_MaxLight << m_MinLight;
arc("direction", m_Direction)
("maxlight", m_MaxLight)
("minlight", m_MinLight);
}
//-----------------------------------------------------------------------------
@ -728,10 +742,14 @@ DGlow2::DGlow2 ()
{
}
void DGlow2::Serialize(FArchive &arc)
void DGlow2::Serialize(FSerializer &arc)
{
Super::Serialize (arc);
arc << m_End << m_MaxTics << m_OneShot << m_Start << m_Tics;
arc("end", m_End)
("maxtics", m_MaxTics)
("oneshot", m_OneShot)
("start", m_Start)
("tics", m_Tics);
}
//-----------------------------------------------------------------------------
@ -857,10 +875,11 @@ DPhased::DPhased ()
{
}
void DPhased::Serialize(FArchive &arc)
void DPhased::Serialize(FSerializer &arc)
{
Super::Serialize (arc);
arc << m_BaseLevel << m_Phase;
arc("baselevel", m_BaseLevel)
("phase", m_Phase);
}
//-----------------------------------------------------------------------------