Merge branch 'blankart-dev' into AirDrop
This commit is contained in:
commit
17e92d25f1
2 changed files with 2 additions and 2 deletions
|
|
@ -949,7 +949,7 @@ void P_TouchStarPost(mobj_t *post, player_t *player, boolean snaptopost)
|
|||
? post->health - player->starpostnum > 1
|
||||
: post->health >= player->starpostnum + K_CheckpointThreshold(false))
|
||||
{
|
||||
if (!player->checkskip)
|
||||
if (!player->checkskip && !player->bot)
|
||||
{
|
||||
S_StartSound(toucher, sfx_s26d);
|
||||
if (netgame && cv_antigrief.value)
|
||||
|
|
|
|||
|
|
@ -4077,7 +4077,7 @@ void P_PlayerThink(player_t *player)
|
|||
break;
|
||||
}
|
||||
|
||||
if (i < MAXPLAYERS && !player->spectator && !player->exiting && !(player->pflags & PF_NOCONTEST))
|
||||
if (i < MAXPLAYERS && !player->spectator && !player->exiting && !player->bot && !(player->pflags & PF_NOCONTEST))
|
||||
{
|
||||
const tic_t griefval = cv_antigrief.value * TICRATE;
|
||||
const UINT8 n = player - players;
|
||||
|
|
|
|||
Loading…
Reference in a new issue