zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-21 11:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed CheckswitchRange logic for multiple switches on a line.

Browse source
This commit is contained in:
Christoph Oelckers 2023-09-16 21:05:44 +02:00
parent c27beb0be8
commit e86de4463f
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/playsim/p_switch.cpp
View file

@ -195,9 +195,12 @@ bool P_CheckSwitchRange(AActor *user, line_t *line, int sideno, const DVector3 *
}
}
return (user->Level->i_compatflags2 & COMPATF2_CHECKSWITCHRANGE)
if ((user->Level->i_compatflags2 & COMPATF2_CHECKSWITCHRANGE)
? (user->Top() >= open.top)
: (user->Top() > open.top);
: (user->Top() > open.top))
{
return true;
}
}
if ((TexAnim.FindSwitch(side->GetTexture(side_t::bottom))) != NULL)
{
@ -219,9 +222,12 @@ bool P_CheckSwitchRange(AActor *user, line_t *line, int sideno, const DVector3 *
}
}
return (user->Level->i_compatflags2 & COMPATF2_CHECKSWITCHRANGE)
if ((user->Level->i_compatflags2 & COMPATF2_CHECKSWITCHRANGE)
? (user->Z() <= open.bottom)
: (user->Z() < open.bottom);
: (user->Z() < open.bottom))
{
return true;
}
}
if ((flags & ML_3DMIDTEX) || (TexAnim.FindSwitch(side->GetTexture(side_t::mid))) != NULL)
{