Merge branch 'master' into password-security-fix

This commit is contained in:
LJSonik 2018-07-05 19:46:36 +02:00 committed by GitHub
commit 8e3c3a6f65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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