Fix other minor issues brought up
Thanks again Jon
This commit is contained in:
parent
5f2fd005f0
commit
4950069cd6
2 changed files with 7 additions and 1 deletions
|
|
@ -10061,7 +10061,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
||||||
player->itemflags &= ~IF_USERINGS;
|
player->itemflags &= ~IF_USERINGS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player && player->mo && player->mo->health > 0 && !player->spectator && !P_PlayerInPain(player) && player->respawn == 0 && !(player->exiting || mapreset) && leveltime > introtime)
|
if (player && player->mo && player->mo->health > 0 && !player->spectator && !P_PlayerInPain(player) && player->respawn == 0 && !(player->exiting || mapreset))
|
||||||
{
|
{
|
||||||
// First, the really specific, finicky items that function without the item being directly in your item slot.
|
// First, the really specific, finicky items that function without the item being directly in your item slot.
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -2156,6 +2156,12 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
||||||
if (player->pflags & PF_GODMODE)
|
if (player->pflags & PF_GODMODE)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if (player->exiting)
|
||||||
|
{
|
||||||
|
K_DoInstashield(player);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (!force)
|
if (!force)
|
||||||
{
|
{
|
||||||
// Player hits another player
|
// Player hits another player
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue