lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Skip character select entirely if only one character is available on the list.

Browse source
This commit is contained in:
toaster 2019-11-25 17:05:58 +00:00
parent fc407cf6ce
commit f86b46640d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/m_menu.c
View file

@ -8334,8 +8334,7 @@ static void M_SetupChoosePlayer(INT32 choice)
{ {
INT32 skinnum; INT32 skinnum;
UINT8 i; UINT8 i;
UINT8 firstvalid = 255; UINT8 firstvalid = 255, lastvalid = 255;
UINT8 lastvalid = 0;
boolean allowed = false; boolean allowed = false;
char *and; char *and;
(void)choice; (void)choice;
@ -8405,9 +8404,9 @@ static void M_SetupChoosePlayer(INT32 choice)
} }
} }
if (firstvalid == 255) // We're being forced into a specific character, so might as well just skip it. if (firstvalid == lastvalid) // We're being forced into a specific character, so might as well just skip it.
{ {
M_ChoosePlayer(-1); M_ChoosePlayer(firstvalid);
return; return;
} }
@ -8741,7 +8740,7 @@ static void M_ChoosePlayer(INT32 choice)
UINT8 skinnum; UINT8 skinnum;
// skip this if forcecharacter or no characters available // skip this if forcecharacter or no characters available
if (choice == -1) if (choice == 255)
{ {
skinnum = botskin = 0; skinnum = botskin = 0;
botingame = false; botingame = false;