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

Fix Mario block item placement

Browse source
This commit is contained in:
Eidolon 2022-04-28 22:32:35 -05:00
parent 42ebf163e6
commit 8f43b5afd0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_floor.c
View file

@ -2455,9 +2455,9 @@ void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
} }
P_UnsetThingPosition(thing); P_UnsetThingPosition(thing);
thing->x = sector->soundorg.x; thing->x = thing->old_x = sector->soundorg.x;
thing->y = sector->soundorg.y; thing->y = thing->old_y = sector->soundorg.y;
thing->z = topheight; thing->z = thing->old_z = topheight;
thing->momz = FixedMul(6*FRACUNIT, thing->scale); thing->momz = FixedMul(6*FRACUNIT, thing->scale);
P_SetThingPosition(thing); P_SetThingPosition(thing);
if (thing->flags & MF_SHOOTABLE) if (thing->flags & MF_SHOOTABLE)
@ -2478,9 +2478,9 @@ void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
if (itsamonitor && thing) if (itsamonitor && thing)
{ {
P_UnsetThingPosition(thing); P_UnsetThingPosition(thing);
thing->x = oldx; thing->x = thing->old_x = oldx;
thing->y = oldy; thing->y = thing->old_y = oldy;
thing->z = oldz; thing->z = thing->old_z = oldz;
thing->momx = 1; thing->momx = 1;
thing->momy = 1; thing->momy = 1;
P_SetThingPosition(thing); P_SetThingPosition(thing);