AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-24 21:38:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

force interpolation in second call to T_MovePlane() (#1101)

Browse Source 
* Revert "fix door interpolation in Doom2 MAP19 (#1100)"

This reverts commit 9b1ec60e3c1e69f26174f82b1b44f6245702a322.

* fix door interpolation in Doom2 MAP19

* force interpolation in second call to T_MovePlane()

---------

Co-authored-by: Roman Fomin <rfomin@gmail.com>
This commit is contained in:
Fabian Greffrath 2023-06-12 11:34:59 +02:00 committed by GitHub
parent 9b1ec60e3c
commit 0c8e524e3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/p_floor.c
View File

@ -61,13 +61,6 @@ result_e T_MovePlane
fixed_t lastpos;
fixed_t destheight; //jff 02/04/98 used to keep floors/ceilings
// from moving thru each other
static boolean moved_ceil, moved_floor;
if (sector->oldgametic != gametic)
{
sector->oldgametic = gametic;
moved_ceil = moved_floor = false;
}
switch(floorOrCeiling)
{
@ -75,10 +68,10 @@ result_e T_MovePlane
// Moving a floor
// [AM] Store old sector heights for interpolation.
if (!moved_floor)
if (sector->oldgametic != gametic)
{
sector->oldfloorheight = sector->floorheight;
moved_floor = true;
sector->oldgametic = gametic;
}
switch(direction)
@ -159,10 +152,10 @@ result_e T_MovePlane
// moving a ceiling
// [AM] Store old sector heights for interpolation.
if (!moved_ceil)
if (sector->oldgametic != gametic)
{
sector->oldceilingheight = sector->ceilingheight;
moved_ceil = true;
sector->oldgametic = gametic;
}
switch(direction)
@ -371,6 +364,8 @@ void T_MoveElevator(elevator_t* elevator)
elevator->direction
);
if (res==ok || res==pastdest) // jff 4/7/98 don't move ceil if blocked
{
elevator->sector->oldgametic = -1; // [FG] force interpolation
T_MovePlane
(
elevator->sector,
@ -380,6 +375,7 @@ void T_MoveElevator(elevator_t* elevator)
0, // move ceiling
elevator->direction
);
}
}
else // up
{
@ -393,6 +389,8 @@ void T_MoveElevator(elevator_t* elevator)
elevator->direction
);
if (res==ok || res==pastdest) // jff 4/7/98 don't move floor if blocked
{
elevator->sector->oldgametic = -1; // [FG] force interpolation
T_MovePlane
(
elevator->sector,
@ -402,6 +400,7 @@ void T_MoveElevator(elevator_t* elevator)
1, // move floor
elevator->direction
);
}
}
// make floor move sound