Merge branch 'minecartspawner-fix' into 'next'

Disable minecart spawners for players already riding a minecart

See merge request STJr/SRB2!608
This commit is contained in:
James R 2019-12-31 17:15:18 -05:00
commit bd0deea11c

View file

@ -1807,7 +1807,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
return;
case MT_MINECARTSPAWNER:
if (!player->bot && (special->fuse < TICRATE || player->powers[pw_carry] != CR_MINECART))
if (!player->bot && special->fuse <= TICRATE && player->powers[pw_carry] != CR_MINECART)
{
mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART);
P_SetTarget(&mcart->target, toucher);