Merge branch 'wooddebris-fix' into 'master'
Wood debris fix See merge request STJr/SRB2Internal!240
This commit is contained in:
commit
e5a0bd8be3
|
@ -19480,7 +19480,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
100, // mass
|
100, // mass
|
||||||
0, // damage
|
0, // damage
|
||||||
sfx_None, // activesound
|
sfx_None, // activesound
|
||||||
MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT, // flags
|
MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags
|
||||||
S_NULL // raisestate
|
S_NULL // raisestate
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -1702,6 +1702,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
||||||
|
|
||||||
case MT_CANARIVORE_GAS:
|
case MT_CANARIVORE_GAS:
|
||||||
// if player and gas touch, attach gas to player (overriding any gas that already attached) and apply slowdown effect
|
// if player and gas touch, attach gas to player (overriding any gas that already attached) and apply slowdown effect
|
||||||
|
special->flags |= MF_NOGRAVITY|MF_NOCLIPHEIGHT;
|
||||||
P_UnsetThingPosition(special);
|
P_UnsetThingPosition(special);
|
||||||
special->x = toucher->x - toucher->momx/2;
|
special->x = toucher->x - toucher->momx/2;
|
||||||
special->y = toucher->y - toucher->momy/2;
|
special->y = toucher->y - toucher->momy/2;
|
||||||
|
|
|
@ -7332,6 +7332,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||||
case MT_ROCKCRUMBLE14:
|
case MT_ROCKCRUMBLE14:
|
||||||
case MT_ROCKCRUMBLE15:
|
case MT_ROCKCRUMBLE15:
|
||||||
case MT_ROCKCRUMBLE16:
|
case MT_ROCKCRUMBLE16:
|
||||||
|
case MT_WOODDEBRIS:
|
||||||
if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
|
if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
|
||||||
&& mobj->state != &states[mobj->info->deathstate])
|
&& mobj->state != &states[mobj->info->deathstate])
|
||||||
{
|
{
|
||||||
|
@ -8523,7 +8524,6 @@ void P_MobjThinker(mobj_t *mobj)
|
||||||
momz = abs(mobj->momz);
|
momz = abs(mobj->momz);
|
||||||
if (R_PointToDist2(0, 0, mobj->momx, mobj->momy) < momz)
|
if (R_PointToDist2(0, 0, mobj->momx, mobj->momy) < momz)
|
||||||
P_InstaThrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), momz);
|
P_InstaThrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), momz);
|
||||||
mobj->flags |= MF_NOGRAVITY|MF_NOCLIPHEIGHT;
|
|
||||||
mobj->flags2 |= MF2_AMBUSH;
|
mobj->flags2 |= MF2_AMBUSH;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue