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

Correct hitboxradius value; proper sparkle->z when moving x/y

Browse source
This commit is contained in:
mazmazz 2018-08-13 04:49:32 -04:00
parent ce0b23a576
commit 1bc5976534
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_mobj.c
View file

@ -7951,7 +7951,7 @@ void P_MobjThinker(mobj_t *mobj)
if (goalpost->x != mobj->x || goalpost->y != mobj->y) if (goalpost->x != mobj->x || goalpost->y != mobj->y)
{ {
P_TeleportMove(goalpost, mobj->x, mobj->y, goalpost->z); P_TeleportMove(goalpost, mobj->x, mobj->y, goalpost->z);
P_TeleportMove(sparkle, mobj->x, mobj->y, goalpost->z); P_TeleportMove(sparkle, mobj->x, mobj->y, sparkle->z);
} }
if (droneman->x != mobj->x || droneman->y != mobj->y) if (droneman->x != mobj->x || droneman->y != mobj->y)
@ -10686,7 +10686,7 @@ ML_EFFECT4 : Don't clip inside the ground
boolean bottomoffsetted = !(mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA); boolean bottomoffsetted = !(mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA);
INT16 timelimit = mthing->angle & 0xFFF; INT16 timelimit = mthing->angle & 0xFFF;
fixed_t hitboxradius = (mthing->angle & 0xF000) * 32 * FRACUNIT; fixed_t hitboxradius = ((mthing->angle & 0xF000) >> 12) * 32 * FRACUNIT;
fixed_t hitboxheight = mthing->extrainfo * 32 * FRACUNIT; fixed_t hitboxheight = mthing->extrainfo * 32 * FRACUNIT;
fixed_t oldheight = mobj->height; fixed_t oldheight = mobj->height;
fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff; fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff;