lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Let ridden rollout rocks collide with other players

This commit is contained in:
lachwright 2019-10-07 13:14:23 +08:00
parent 2d33950590
commit 7850d43725
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/p_map.c
View File

@ -985,7 +985,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
tmthing->player->powers[pw_carry] = CR_ROLLOUT; tmthing->player->powers[pw_carry] = CR_ROLLOUT;
P_SetTarget(&tmthing->tracer, thing); P_SetTarget(&tmthing->tracer, thing);
P_SetObjectMomZ(thing, tmthing->momz, true); P_SetObjectMomZ(thing, tmthing->momz, true);
return false; return true;
} }
} }
else if (tmthing->type == thing->type) else if (tmthing->type == thing->type)
@ -1004,6 +1004,9 @@ static boolean PIT_CheckThing(mobj_t *thing)
{ {
if (tmthing->z > thing->z + thing->height || thing->z > tmthing->z + tmthing->height || !thing->health) if (tmthing->z > thing->z + thing->height || thing->z > tmthing->z + tmthing->height || !thing->health)
return true; return true;
if (thing == tmthing->target)
return true;
if (thing->flags & MF_SPRING) if (thing->flags & MF_SPRING)
{ {
@ -1660,8 +1663,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
} }
} }
if ((!tmthing->player) && (thing->player)) if ((tmthing->flags & MF_SPRING || tmthing->type == MT_STEAM) && (thing->player))
; // no solid thing should ever be able to step up onto a player ; // springs and gas jets should never be able to step up onto a player
// z checking at last // z checking at last
// Treat noclip things as non-solid! // Treat noclip things as non-solid!
else if ((thing->flags & (MF_SOLID|MF_NOCLIP)) == MF_SOLID else if ((thing->flags & (MF_SOLID|MF_NOCLIP)) == MF_SOLID