Skip to content

Commit e090562

Browse files
author
dashodanger
committed
More plane mover interpolation adjustments
1 parent 159cedf commit e090562

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

source_files/edge/p_plane.cc

+10-5
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,10 @@ static bool MovePlane(PlaneMover *plane)
324324

325325
Sector *sec = plane->sector;
326326

327-
sec->old_ceiling_height = sec->ceiling_height;
328-
sec->old_floor_height = sec->floor_height;
327+
if (plane->is_ceiling || plane->is_elevator)
328+
sec->old_ceiling_height = sec->ceiling_height;
329+
if (!plane->is_ceiling)
330+
sec->old_floor_height = sec->floor_height;
329331

330332
switch (plane->direction)
331333
{
@@ -1580,13 +1582,16 @@ void RunActivePlanes(void)
15801582
}
15811583

15821584
if (pmov->is_ceiling || pmov->is_elevator)
1585+
{
15831586
pmov->sector->ceiling_move = nullptr;
1587+
pmov->sector->old_ceiling_height = pmov->sector->ceiling_height;
1588+
}
15841589

15851590
if (!pmov->is_ceiling)
1591+
{
15861592
pmov->sector->floor_move = nullptr;
1587-
1588-
pmov->sector->old_ceiling_height = pmov->sector->ceiling_height;
1589-
pmov->sector->old_floor_height = pmov->sector->floor_height;
1593+
pmov->sector->old_floor_height = pmov->sector->floor_height;
1594+
}
15901595

15911596
*PMI = nullptr;
15921597
delete pmov;

0 commit comments

Comments
 (0)