stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix source object not being passed for pushers with p_push type.

Browse source
This commit is contained in:
spherallic 2022-01-11 16:28:40 +01:00
parent ecd7f41c58
commit 7fbf58decf
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/p_spec.c
View file

@ -8879,23 +8879,23 @@ static void P_SpawnPushers(void)
case 541: // wind case 541: // wind
pushertype = p_wind; pushertype = p_wind;
break; break;
case 542: // wind up
pushertype = p_upwind;
break;
case 543: // wind down
pushertype = p_downwind;
break;
case 544: // current case 544: // current
pushertype = p_current; pushertype = p_current;
break; break;
case 547: // push/pull
pushertype = p_push;
break;
case 545: // current up case 545: // current up
pushertype = p_upcurrent; pushertype = p_upcurrent;
break; break;
case 546: // current down case 546: // current down
pushertype = p_downcurrent; pushertype = p_downcurrent;
break; break;
case 542: // wind up case 547: // push/pull
pushertype = p_upwind; pushertype = p_push;
break;
case 543: // wind down
pushertype = p_downwind;
break; break;
default: default:
valid = false; valid = false;
@ -8910,13 +8910,13 @@ static void P_SpawnPushers(void)
{ {
thing = P_GetPushThing(s); thing = P_GetPushThing(s);
if (thing) // No MT_P* means no effect if (thing) // No MT_P* means no effect
Add_Pusher(p_push, dx, dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); Add_Pusher(p_push, dx, dy, thing, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
} }
else else
{ {
thing = P_GetPushThing(l->frontsector - sectors); thing = P_GetPushThing(l->frontsector - sectors);
if (thing) // No MT_P* means no effect if (thing) // No MT_P* means no effect
Add_Pusher(p_push, dx, dy, NULL, l->frontsector - sectors, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); Add_Pusher(p_push, dx, dy, thing, l->frontsector - sectors, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
} }
} }
else else