Merge branch 'the-scary-22-merge' into battle-rethink

This commit is contained in:
James R 2020-10-25 13:44:43 -07:00
commit a50d281658

View file

@ -1786,6 +1786,8 @@ static void P_CheckInvincibilityTimer(player_t *player)
player->mo->color = player->skincolor;
G_GhostAddColor((INT32) (player - players), GHC_NORMAL);
}
P_RestoreMusic(player);
}
}