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

Fixed a bug involving players being thrown out of minecarts

Browse source
This commit is contained in:
MascaraSnake 2019-06-16 16:39:06 +02:00
parent 3dc4e1d950
commit f272a29a8d
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_inter.c
View file

@ -3660,9 +3660,6 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
} }
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
mo->momz *= -1; mo->momz *= -1;
if (P_IsObjectOnGround(player->mo))
player->powers[pw_carry] = CR_NONE;
} }
player->losstime += 10*TICRATE; player->losstime += 10*TICRATE;

2
src/p_mobj.c
View file

@ -8948,7 +8948,7 @@ void P_PushableThinker(mobj_t *mobj)
if (mobj->type == MT_MINECART && mobj->health) if (mobj->type == MT_MINECART && mobj->health)
{ {
// If player is ded, remove this minecart // If player is ded, remove this minecart
if (!mobj->target || P_MobjWasRemoved(mobj->target) || !mobj->target->health) if (!mobj->target || P_MobjWasRemoved(mobj->target) || !mobj->target->health || !mobj->target->player || mobj->target->player->powers[pw_carry] != CR_MINECART)
{ {
P_KillMobj(mobj, NULL, NULL, 0); P_KillMobj(mobj, NULL, NULL, 0);
return; return;