Merge branch 'fix_startbumps' into 'master'

Fix startbumps.

See merge request KartKrew/Kart!84
This commit is contained in:
Sal 2018-11-07 14:50:00 -05:00
commit ef0ab3da24
1 changed files with 2 additions and 2 deletions

View File

@ -2621,10 +2621,10 @@ static boolean G_CheckSpot(INT32 playernum, mapthing_t *mthing)
x = mthing->x << FRACBITS;
y = mthing->y << FRACBITS;
if (!P_CheckPosition(players[playernum].mo, x, y))
if (!K_CheckPlayersRespawnColliding(playernum, x, y))
return false;
if (!K_CheckPlayersRespawnColliding(playernum, x, y))
if (!P_CheckPosition(players[playernum].mo, x, y))
return false;
return true;