From d40ed5c587e8101f1b68f148c328014c2054fbbc Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 30 Mar 2019 18:12:33 +0100 Subject: [PATCH] - reverted D_GenderToInt to check full words instead of merely initial letters. --- src/d_netinfo.cpp | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp index 5699f6cc2..0aedc48b2 100644 --- a/src/d_netinfo.cpp +++ b/src/d_netinfo.cpp @@ -137,23 +137,13 @@ FString D_UnescapeUserInfo (const char *str, size_t len) int D_GenderToInt (const char *gender) { - switch (gender[0]) - { - case 'F': - case 'f': - return GENDER_FEMALE; - - case 'N': - case 'n': - return GENDER_NEUTER; - - case 'O': - case 'o': - return GENDER_OBJECT; - - default: - return GENDER_MALE; - } + if (!stricmp(gender, "female")) return GENDER_FEMALE; + if (!stricmp(gender, "neutral")) return GENDER_NEUTER; + if (!stricmp(gender, "neuter")) return GENDER_NEUTER; + if (!stricmp(gender, "other")) return GENDER_OBJECT; + if (!stricmp(gender, "object")) return GENDER_OBJECT; + if (!stricmp(gender, "cyborg")) return GENDER_OBJECT; + return GENDER_MALE; } int D_PlayerClassToInt (const char *classname)