File tree 3 files changed +33
-6
lines changed
3 files changed +33
-6
lines changed Original file line number Diff line number Diff line change @@ -903,6 +903,12 @@ void DElevator::Serialize(FSerializer &arc)
903
903
(" interp_ceiling" , m_Interp_Ceiling);
904
904
}
905
905
906
+ DEFINE_FIELD (DElevator, m_Type)
907
+ DEFINE_FIELD(DElevator, m_Direction)
908
+ DEFINE_FIELD(DElevator, m_FloorDestDist)
909
+ DEFINE_FIELD(DElevator, m_CeilingDestDist)
910
+ DEFINE_FIELD(DElevator, m_Speed)
911
+
906
912
// ==========================================================================
907
913
//
908
914
//
@@ -973,7 +979,7 @@ void DElevator::Tick ()
973
979
}
974
980
}
975
981
976
- if (res == EMoveResult::pastdest) // if destination height acheived
982
+ if (res == EMoveResult::pastdest) // if destination height achieved
977
983
{
978
984
// make floor stop sound
979
985
SN_StopSequence (m_Sector, CHAN_FLOOR);
Original file line number Diff line number Diff line change @@ -105,18 +105,20 @@ class DElevator : public DMover
105
105
elevateLower
106
106
};
107
107
108
+ EElevator m_Type;
109
+ int m_Direction;
110
+ double m_FloorDestDist;
111
+ double m_CeilingDestDist;
112
+ double m_Speed;
113
+
114
+
108
115
void Construct (sector_t *sec);
109
116
110
117
void OnDestroy () override ;
111
118
void Serialize (FSerializer &arc);
112
119
void Tick ();
113
120
114
121
protected:
115
- EElevator m_Type;
116
- int m_Direction;
117
- double m_FloorDestDist;
118
- double m_CeilingDestDist;
119
- double m_Speed;
120
122
TObjPtr<DInterpolation*> m_Interp_Ceiling;
121
123
TObjPtr<DInterpolation*> m_Interp_Floor;
122
124
Original file line number Diff line number Diff line change @@ -643,6 +643,25 @@ class SectorEffect : Thinker native
643
643
class Mover : SectorEffect native
644
644
{}
645
645
646
+ class Elevator : Mover native
647
+ {
648
+ enum EElevator
649
+ {
650
+ elevateUp,
651
+ elevateDown,
652
+ elevateCurrent,
653
+ // [RH] For FloorAndCeiling_Raise/Lower
654
+ elevateRaise,
655
+ elevateLower
656
+ };
657
+
658
+ native readonly EElevator m_Type;
659
+ native readonly int m_Direction;
660
+ native readonly double m_FloorDestDist;
661
+ native readonly double m_CeilingDestDist;
662
+ native readonly double m_Speed;
663
+ }
664
+
646
665
class MovingFloor : Mover native
647
666
{}
648
667
You can’t perform that action at this time.
0 commit comments