thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'howdyalikethemcherries' into 'master'

Browse source 
How'd'ya like them cherries

See merge request KartKrew/Kart!53
This commit is contained in:
Sal 2018-10-24 16:01:47 -04:00
commit 87d51cc491
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/p_mobj.c
View file

@ -2626,12 +2626,14 @@ static boolean P_ZMovement(mobj_t *mo)
mom.z /= 2; // Rocks not so bouncy mom.z /= 2; // Rocks not so bouncy
if (abs(mom.x) < FixedMul(STOPSPEED, mo->scale) if (!mo->fuse
&& abs(mom.y) < FixedMul(STOPSPEED, mo->scale) && abs(mom.x) < FixedMul(STOPSPEED*2, mo->scale)
&& abs(mom.z) < FixedMul(STOPSPEED*3, mo->scale)) && abs(mom.y) < FixedMul(STOPSPEED*2, mo->scale)
&& abs(mom.z) < FixedMul(STOPSPEED*2*3, mo->scale))
{ {
P_RemoveMobj(mo); //P_RemoveMobj(mo);
return false; //return false;
mo->fuse = TICRATE;
} }
} }
else if (mo->type == MT_CANNONBALLDECOR) else if (mo->type == MT_CANNONBALLDECOR)
@ -7442,13 +7444,14 @@ void P_MobjThinker(mobj_t *mobj)
{ {
case MT_FALLINGROCK: case MT_FALLINGROCK:
// Despawn rocks here in case zmovement code can't do so (blame slopes) // Despawn rocks here in case zmovement code can't do so (blame slopes)
if (!mobj->momx && !mobj->momy && !mobj->momz if (!mobj->fuse && !mobj->momx && !mobj->momy && !mobj->momz
&& ((mobj->eflags & MFE_VERTICALFLIP) ? && ((mobj->eflags & MFE_VERTICALFLIP) ?
mobj->z + mobj->height >= mobj->ceilingz mobj->z + mobj->height >= mobj->ceilingz
: mobj->z <= mobj->floorz)) : mobj->z <= mobj->floorz))
{ {
P_RemoveMobj(mobj); //P_RemoveMobj(mobj);
return; //return;
mobj->fuse = TICRATE;
} }
P_MobjCheckWater(mobj); P_MobjCheckWater(mobj);
break; break;
@ -8782,7 +8785,7 @@ for (i = ((mobj->flags2 & MF2_STRONGBOX) ? strongboxamt : weakboxamt); i; --i) s
if (P_MobjWasRemoved(mobj)) if (P_MobjWasRemoved(mobj))
return; return;
} }
else if (((mobj->type == MT_RANDOMITEM && mobj->threshold == 69) || mobj->type == MT_FAKEITEM) && mobj->fuse <= TICRATE) else if (((mobj->type == MT_RANDOMITEM && mobj->threshold == 69) || mobj->type == MT_FAKEITEM || mobj->type == MT_FALLINGROCK) && mobj->fuse <= TICRATE)
mobj->flags2 ^= MF2_DONTDRAW; mobj->flags2 ^= MF2_DONTDRAW;
} }