Merge branch 'master' into next

This commit is contained in:
Monster Iestyn 2018-06-27 15:06:12 +01:00
commit 25cd61c094

View file

@ -6543,7 +6543,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
if (choice < 32 || choice > 127 || itemOn != 0)
break;
l = strlen(setupm_name);
if (l < MAXPLAYERNAME-1)
if (l < MAXPLAYERNAME)
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_name[l] =(char)choice;