mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-26 20:11:47 +00:00
Merge branch 'respawn-noclipthing' into 'master'
Do not run any thing collision for respawning players whatsoever Closes #302 See merge request KartKrew/Kart!1105
This commit is contained in:
commit
3ad4bb36d2
1 changed files with 4 additions and 0 deletions
|
|
@ -283,6 +283,8 @@ void K_DoIngameRespawn(player_t *player)
|
||||||
|
|
||||||
player->respawn.airtimer = player->airtime;
|
player->respawn.airtimer = player->airtime;
|
||||||
player->respawn.truedeath = !!(player->pflags & PF_FAULT);
|
player->respawn.truedeath = !!(player->pflags & PF_FAULT);
|
||||||
|
|
||||||
|
player->mo->flags |= MF_NOCLIPTHING;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------
|
/*--------------------------------------------------
|
||||||
|
|
@ -790,6 +792,8 @@ static void K_HandleDropDash(player_t *player)
|
||||||
P_PlayerRingBurst(player, 3);
|
P_PlayerRingBurst(player, 3);
|
||||||
|
|
||||||
player->respawn.state = RESPAWNST_NONE;
|
player->respawn.state = RESPAWNST_NONE;
|
||||||
|
|
||||||
|
player->mo->flags &= ~(MF_NOCLIPTHING);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue