Merge branch 'fix-ring-drain' into 'master'

Fix Ring Drain sectors

See merge request KartKrew/Kart!184
This commit is contained in:
Sal 2019-10-07 00:56:38 -04:00
commit 9d1dce0ab8

View file

@ -3637,10 +3637,9 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
break;
case 9: // Ring Drainer (Floor Touch)
case 10: // Ring Drainer (No Floor Touch)
if (leveltime % (TICRATE/2) == 0 && player->mo->health > 1)
if (leveltime % (TICRATE/2) == 0 && player->kartstuff[k_rings] > 0)
{
player->mo->health--;
player->health--;
player->kartstuff[k_rings]--;
S_StartSound(player->mo, sfx_itemup);
}
break;