Line fixes for visual element positioning
# Conflicts: # src/p_mobj.c
This commit is contained in:
parent
2c4f9d4776
commit
72b592888f
|
@ -10573,15 +10573,13 @@ ML_EFFECT4 : Don't clip inside the ground
|
||||||
boolean middlealigned = (mthing->options & MTF_EXTRA) && !(mthing->options & MTF_OBJECTSPECIAL);
|
boolean middlealigned = (mthing->options & MTF_EXTRA) && !(mthing->options & MTF_OBJECTSPECIAL);
|
||||||
boolean bottomoffsetted = !(mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA);
|
boolean bottomoffsetted = !(mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA);
|
||||||
|
|
||||||
fixed_t droneboxmandiff = max(mobj->height - mobjinfo[MT_NIGHTSDRONE_MAN].height, 0);
|
|
||||||
fixed_t dronemangoaldiff = max(mobjinfo[MT_NIGHTSDRONE_MAN].height - mobjinfo[MT_NIGHTSDRONE_GOAL].height, 0);
|
|
||||||
|
|
||||||
INT16 timelimit = mthing->angle;
|
INT16 timelimit = mthing->angle;
|
||||||
fixed_t hitboxheight = mthing->extrainfo * 32 * FRACUNIT;
|
fixed_t hitboxheight = mthing->extrainfo * 32 * FRACUNIT;
|
||||||
fixed_t oldheight = mobj->height;
|
fixed_t oldheight = mobj->height;
|
||||||
// if you want to use parameter for something else, do this instead:
|
// if you want to use parameter for something else, do this instead:
|
||||||
// timelimit = mthing->angle & 0xFFF; hitboxheight = (mthing->extrainfo >> 12) * 32 * FRACUNIT;
|
// timelimit = mthing->angle & 0xFFF; hitboxheight = (mthing->extrainfo >> 12) * 32 * FRACUNIT;
|
||||||
fixed_t dronemanoffset, goaloffset, sparkleoffset;
|
fixed_t oldheight = mobj->height;
|
||||||
|
fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff;
|
||||||
|
|
||||||
if (mthing->angle > 0)
|
if (mthing->angle > 0)
|
||||||
mobj->health = timelimit;
|
mobj->health = timelimit;
|
||||||
|
@ -10591,6 +10589,9 @@ ML_EFFECT4 : Don't clip inside the ground
|
||||||
else
|
else
|
||||||
mobj->height = mobjinfo[MT_NIGHTSDRONE].height;
|
mobj->height = mobjinfo[MT_NIGHTSDRONE].height;
|
||||||
|
|
||||||
|
droneboxmandiff = max(mobj->height - mobjinfo[MT_NIGHTSDRONE_MAN].height, 0);
|
||||||
|
dronemangoaldiff = max(mobjinfo[MT_NIGHTSDRONE_MAN].height - mobjinfo[MT_NIGHTSDRONE_GOAL].height, 0);
|
||||||
|
|
||||||
if (flip && mobj->height != oldheight)
|
if (flip && mobj->height != oldheight)
|
||||||
P_TeleportMove(mobj, mobj->x, mobj->y, mobj->z - (mobj->height - oldheight));
|
P_TeleportMove(mobj, mobj->x, mobj->y, mobj->z - (mobj->height - oldheight));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue