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

Merge branch 'wooddebris-fix' into 'master'

Browse source 
Wood debris fix

See merge request STJr/SRB2Internal!240
This commit is contained in:
MascaraSnake 2019-06-29 03:21:15 -04:00
commit e5a0bd8be3
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -19480,7 +19480,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
100, // mass
0, // damage
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
},

1
src/p_inter.c
View file

@ -1702,6 +1702,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
case MT_CANARIVORE_GAS:
// 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);
special->x = toucher->x - toucher->momx/2;
special->y = toucher->y - toucher->momy/2;

2
src/p_mobj.c
View file

@ -7332,6 +7332,7 @@ void P_MobjThinker(mobj_t *mobj)
case MT_ROCKCRUMBLE14:
case MT_ROCKCRUMBLE15:
case MT_ROCKCRUMBLE16:
case MT_WOODDEBRIS:
if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
&& mobj->state != &states[mobj->info->deathstate])
{
@ -8523,7 +8524,6 @@ void P_MobjThinker(mobj_t *mobj)
momz = abs(mobj->momz);
if (R_PointToDist2(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;
break;
}