stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-22 02:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'scroller-fix' into 'next'

Browse source 
Add_Scroller: Don't call IsSector3DBlock if affectee is a side

Closes #898

See merge request STJr/SRB2!1852
This commit is contained in:
Eidolon 2022-11-06 16:08:22 +00:00
commit 0b4ceeb73b
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_spec.c
View file

@ -7500,7 +7500,6 @@ static boolean IsSector3DBlock(sector_t* sec)
*/
static void Add_Scroller(INT32 type, fixed_t dx, fixed_t dy, INT32 control, INT32 affectee, INT32 accel, INT32 exclusive)
{
boolean is3dblock = IsSector3DBlock(&sectors[affectee]);
scroll_t *s = Z_Calloc(sizeof *s, PU_LEVSPEC, NULL);
s->thinker.function.acp1 = (actionf_p1)T_Scroll;
s->type = type;
@ -7516,7 +7515,7 @@ static void Add_Scroller(INT32 type, fixed_t dx, fixed_t dy, INT32 control, INT3
if (type == sc_carry || type == sc_carry_ceiling)
{
sectors[affectee].specialflags |= SSF_CONVEYOR;
if (is3dblock)
if (IsSector3DBlock(&sectors[affectee]))
{
if (type == sc_carry)
sectors[affectee].flags |= MSF_FLIPSPECIAL_CEILING;