zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 06:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: DAnimatedDoor must not start an interpolation on the door sector's ceiling.

Browse source
This commit is contained in:
Christoph Oelckers 2016-06-13 13:58:04 +02:00
parent 624c935385
commit d74584e5b2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dsectoreffect.cpp
View file

@ -126,11 +126,11 @@ DMovingCeiling::DMovingCeiling ()
{ {
} }
DMovingCeiling::DMovingCeiling (sector_t *sector) DMovingCeiling::DMovingCeiling (sector_t *sector, bool interpolate)
: DMover (sector) : DMover (sector)
{ {
sector->ceilingdata = this; sector->ceilingdata = this;
interpolation = sector->SetInterpolation(sector_t::CeilingMove, true); if (interpolate) interpolation = sector->SetInterpolation(sector_t::CeilingMove, true);
} }
bool sector_t::MoveAttached(int crush, double move, int floorOrCeiling, bool resetfailed) bool sector_t::MoveAttached(int crush, double move, int floorOrCeiling, bool resetfailed)

2
src/dsectoreffect.h
View file

@ -49,7 +49,7 @@ class DMovingCeiling : public DMover
{ {
DECLARE_CLASS (DMovingCeiling, DMover) DECLARE_CLASS (DMovingCeiling, DMover)
public: public:
DMovingCeiling (sector_t *sector); DMovingCeiling (sector_t *sector, bool interpolate = true);
protected: protected:
DMovingCeiling (); DMovingCeiling ();
}; };

2
src/p_doors.cpp
View file

@ -526,7 +526,7 @@ DAnimatedDoor::DAnimatedDoor ()
} }
DAnimatedDoor::DAnimatedDoor (sector_t *sec) DAnimatedDoor::DAnimatedDoor (sector_t *sec)
: DMovingCeiling (sec) : DMovingCeiling (sec, false)
{ {
} }