zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-04-04 00:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Exposed DDoor to ZScript.

Browse source 
Also added a ZScript-only enum for the movement direction..
This commit is contained in:
inkoalawetrust 2025-02-22 14:32:19 +02:00 committed by Rachael Alexanderson
parent 093d3e32e6
commit b80572e400
3 changed files with 55 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/playsim/mapthinkers/a_doors.cpp
View file

@ -40,6 +40,7 @@
#include "g_levellocals.h"
#include "animations.h"
#include "texturemanager.h"
#include "vm.h"
//============================================================================
//
@ -64,6 +65,17 @@ void DDoor::Serialize(FSerializer &arc)
("lighttag", m_LightTag);
}
DEFINE_FIELD(DDoor, m_Type)
DEFINE_FIELD(DDoor, m_TopDist)
DEFINE_FIELD(DDoor, m_BotSpot)
DEFINE_FIELD(DDoor, m_BotDist)
DEFINE_FIELD(DDoor, m_OldFloorDist)
DEFINE_FIELD(DDoor, m_Speed)
DEFINE_FIELD(DDoor, m_Direction)
DEFINE_FIELD(DDoor, m_TopWait)
DEFINE_FIELD(DDoor, m_TopCountdown)
DEFINE_FIELD(DDoor, m_LightTag)
//============================================================================
//
// T_VerticalDoor

14
src/playsim/mapthinkers/a_doors.h
View file

@ -17,16 +17,10 @@ public:
doorWaitClose,
};
void Construct(sector_t *sector);
void Construct(sector_t *sec, EVlDoor type, double speed, int delay, int lightTag, int topcountdown);
void Serialize(FSerializer &arc);
void Tick ();
protected:
EVlDoor m_Type;
double m_TopDist;
double m_BotDist, m_OldFloorDist;
vertex_t *m_BotSpot;
vertex_t* m_BotSpot;
double m_Speed;
// 1 = up, 0 = waiting at top, -1 = down
@ -40,6 +34,12 @@ protected:
int m_LightTag;
void Construct(sector_t *sector);
void Construct(sector_t *sec, EVlDoor type, double speed, int delay, int lightTag, int topcountdown);
void Serialize(FSerializer &arc);
void Tick ();
protected:
void DoorSound (bool raise, class DSeqNode *curseq=NULL) const;
private:

36
wadsrc/static/zscript/doombase.zs
View file

@ -649,6 +649,42 @@ class MovingFloor : Mover native
class MovingCeiling : Mover native
{}
class Door : MovingCeiling native
{
enum EVlDoor
{
doorClose,
doorOpen,
doorRaise,
doorWaitRaise,
doorCloseWaitOpen,
doorWaitClose,
};
native readonly EVlDoor m_Type;
native readonly double m_TopDist;
native readonly double m_BotDist, m_OldFloorDist;
native readonly Vertex m_BotSpot;
native readonly double m_Speed;
// 1 = up, 0 = waiting at top, -1 = down
enum EDirection
{
dirUp,
dirWait,
dirDown
}
native readonly int m_Direction;
// tics to wait at the top
native readonly int m_TopWait;
// (keep in case a door going down is reset)
// when it reaches 0, start going down
native readonly int m_TopCountdown;
native readonly int m_LightTag;
}
class Floor : MovingFloor native
{
// only here so that some constants and functions can be added. Not directly usable yet.