Skip to content

Fix for sliding doors being able to be manually closed in a half-state (looks closed, actually open) #1351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mutantant wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for sliding doors being able to be manually closed in a half-state (looks closed, actually open) #1351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4135a4
Fix for sliding doors being able to be manually closed in a half-stat…
mutantant Nov 11, 2025
ed0b89a
Update p_doors.c
mutantant Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions src/strife/p_doors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,16 +1315,36 @@ void EV_SlidingDoor(line_t* line, mobj_t* thing)
door = sec->specialdata;
if(door->type == sdt_openAndClose)
{
if(door->status == sd_waiting)
if(door->status == sd_waiting && sec->thinglist == NULL) // Add check for items in the way
{
door->status = sd_closing;
door->timer = SWAITTICS; // villsa [STRIFE]
// [crispy] play sound effect when the door is closed manually
if (crispy->soundfix)
int cheight = sec->ceilingheight;
int speed = cheight - sec->floorheight - (10*FRACUNIT);

// something blocking it?
if(T_MovePlane(sec, speed, sec->floorheight, 0, 1, -1) == crushed)
{
S_StartSound(&sec->soundorg,
slideCloseSounds[door->whichDoorIndex]);
door->timer = SDOORWAIT;
return;
}
else
{
// Instantly move plane
T_MovePlane(sec, (128*FRACUNIT), cheight, 0, 1, 1);

// turn line blocking back on
door->line1->flags |= ML_BLOCKING;
door->line2->flags |= ML_BLOCKING;

// [crispy] play sound effect when the door is closed manually
if (crispy->soundfix)
{
S_StartSound(&sec->soundorg,
slideCloseSounds[door->whichDoorIndex]);
}

door->status = sd_closing;
door->timer = SWAITTICS;
}
}
}
else
Expand Down