mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 07:12:02 +00:00
- Default gender for sound classes should be male and not other since it could be undefined in SNDINFO.
This commit is contained in:
parent
f9ff097457
commit
845141d9af
1 changed files with 5 additions and 5 deletions
|
@ -138,12 +138,12 @@ int D_GenderToInt (const char *gender)
|
||||||
{
|
{
|
||||||
if (gender[0] == 'f')
|
if (gender[0] == 'f')
|
||||||
return GENDER_FEMALE;
|
return GENDER_FEMALE;
|
||||||
else if (gender[0] == 'm')
|
|
||||||
return GENDER_MALE;
|
|
||||||
else if (gender[0] == 'n')
|
else if (gender[0] == 'n')
|
||||||
return GENDER_NEUTER;
|
return GENDER_NEUTER;
|
||||||
else
|
else if (gender[0] == 'o')
|
||||||
return GENDER_OBJECT;
|
return GENDER_OBJECT;
|
||||||
|
else
|
||||||
|
return GENDER_MALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
int D_PlayerClassToInt (const char *classname)
|
int D_PlayerClassToInt (const char *classname)
|
||||||
|
@ -728,8 +728,8 @@ void D_WriteUserInfoStrings (int pnum, uint8_t **stream, bool compact)
|
||||||
case NAME_Gender:
|
case NAME_Gender:
|
||||||
*stream += sprintf(*((char **)stream), "\\%s",
|
*stream += sprintf(*((char **)stream), "\\%s",
|
||||||
*static_cast<FIntCVar *>(pair->Value) == GENDER_FEMALE ? "female" :
|
*static_cast<FIntCVar *>(pair->Value) == GENDER_FEMALE ? "female" :
|
||||||
*static_cast<FIntCVar *>(pair->Value) == GENDER_MALE ? "male" :
|
*static_cast<FIntCVar *>(pair->Value) == GENDER_NEUTER ? "neutral" :
|
||||||
*static_cast<FIntCVar *>(pair->Value) == GENDER_NEUTER ? "neutral" : "other");
|
*static_cast<FIntCVar *>(pair->Value) == GENDER_OBJECT ? "other" : "male");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NAME_PlayerClass:
|
case NAME_PlayerClass:
|
||||||
|
|
Loading…
Reference in a new issue