From d74584e5b247c057ad6192f6da0fb8a29ce74a90 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 13 Jun 2016 13:58:04 +0200 Subject: [PATCH] - fixed: DAnimatedDoor must not start an interpolation on the door sector's ceiling. --- src/dsectoreffect.cpp | 4 ++-- src/dsectoreffect.h | 2 +- src/p_doors.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dsectoreffect.cpp b/src/dsectoreffect.cpp index 180aa9e81..d33eeb061 100644 --- a/src/dsectoreffect.cpp +++ b/src/dsectoreffect.cpp @@ -126,11 +126,11 @@ DMovingCeiling::DMovingCeiling () { } -DMovingCeiling::DMovingCeiling (sector_t *sector) +DMovingCeiling::DMovingCeiling (sector_t *sector, bool interpolate) : DMover (sector) { 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) diff --git a/src/dsectoreffect.h b/src/dsectoreffect.h index 3a564afc4..792771fb6 100644 --- a/src/dsectoreffect.h +++ b/src/dsectoreffect.h @@ -49,7 +49,7 @@ class DMovingCeiling : public DMover { DECLARE_CLASS (DMovingCeiling, DMover) public: - DMovingCeiling (sector_t *sector); + DMovingCeiling (sector_t *sector, bool interpolate = true); protected: DMovingCeiling (); }; diff --git a/src/p_doors.cpp b/src/p_doors.cpp index b122768bb..d6a5f3a44 100644 --- a/src/p_doors.cpp +++ b/src/p_doors.cpp @@ -526,7 +526,7 @@ DAnimatedDoor::DAnimatedDoor () } DAnimatedDoor::DAnimatedDoor (sector_t *sec) - : DMovingCeiling (sec) + : DMovingCeiling (sec, false) { }