mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
make game keep CR_TRAPBUBBLE flag on player respawn/reset
This commit is contained in:
parent
05923e935d
commit
25712a0cf3
2 changed files with 4 additions and 2 deletions
|
|
@ -2626,7 +2626,8 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
|
||||||
K_DropEmeraldsFromPlayer(player, player->emeralds);
|
K_DropEmeraldsFromPlayer(player, player->emeralds);
|
||||||
//K_SetHitLagForObjects(player->mo, inflictor, source, MAXHITLAGTICS, true);
|
//K_SetHitLagForObjects(player->mo, inflictor, source, MAXHITLAGTICS, true);
|
||||||
|
|
||||||
player->carry = CR_NONE;
|
if (player->carry != CR_TRAPBUBBLE)
|
||||||
|
player->carry = CR_NONE;
|
||||||
|
|
||||||
K_KartResetPlayerColor(player);
|
K_KartResetPlayerColor(player);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -418,7 +418,8 @@ void P_ResetPlayer(player_t *player)
|
||||||
{
|
{
|
||||||
//player->pflags &= ~(PF_);
|
//player->pflags &= ~(PF_);
|
||||||
|
|
||||||
player->carry = CR_NONE;
|
if (player->carry != CR_TRAPBUBBLE)
|
||||||
|
player->carry = CR_NONE;
|
||||||
player->onconveyor = 0;
|
player->onconveyor = 0;
|
||||||
|
|
||||||
//player->drift = player->driftcharge = 0;
|
//player->drift = player->driftcharge = 0;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue