From 229ddd2afb47cf2aeeae42f5ce6064d59e69ac42 Mon Sep 17 00:00:00 2001 From: gumi Date: Sat, 25 Apr 2020 19:39:59 -0400 Subject: I hate myself for doing this remove mentions of a non-binary gender, because it's evil backlog, for future reference: <{41444d494e}> i against any gay propaganda. and clean said more than two genders is gay propaganda. if need more than 2 genders, use for other genders word hidden --- src/echar/char.c | 4 ++-- src/echar/init.c | 2 +- src/ecommon/enum/gender.h | 4 ++-- src/emap/pc.c | 2 +- src/emap/script.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/echar/char.c b/src/echar/char.c index cbaa884..29aacf2 100644 --- a/src/echar/char.c +++ b/src/echar/char.c @@ -349,7 +349,7 @@ void echat_send_login_serverexit(const int code) WFIFOSET(chr->login_fd, 4); } -// send non-binary gender to map server +// send all genders to map server int echar_mmo_gender(const struct char_session_data **sd __attribute__ ((unused)), const struct mmo_charstatus **p __attribute__ ((unused)), char *sex) { @@ -361,7 +361,7 @@ int echar_mmo_gender(const struct char_session_data **sd __attribute__ ((unused) case 'F': return GENDER_FEMALE; default: - return GENDER_NONBINARY; + return GENDER_HIDDEN; } } diff --git a/src/echar/init.c b/src/echar/init.c index f58802c..8b7a343 100644 --- a/src/echar/init.c +++ b/src/echar/init.c @@ -66,7 +66,7 @@ HPExport void plugin_init (void) addHookPre(chr, parse_char_connect, echar_parse_char_connect_pre); addHookPre(chr, send_HC_ACK_CHARINFO_PER_PAGE_tail, echar_send_HC_ACK_CHARINFO_PER_PAGE_tail_pre); - // non-binary gender stuff: + // gender stuff: addHookPre(chr, mmo_gender, echar_mmo_gender); addHookPre(chr, changecharsex, echar_changecharsex); diff --git a/src/ecommon/enum/gender.h b/src/ecommon/enum/gender.h index 039ca04..8c747fd 100644 --- a/src/ecommon/enum/gender.h +++ b/src/ecommon/enum/gender.h @@ -7,14 +7,14 @@ #include "common/mmo.h" /** - * identical to SEX_ but also includes nonbinary + * identical to SEX_ but also includes the hidden value */ typedef enum Gender { GENDER_FEMALE = SEX_FEMALE, GENDER_MALE = SEX_MALE, __UNUSED_GENDER_SERVER = SEX_SERVER, - GENDER_NONBINARY, + GENDER_HIDDEN, } Gender; #endif // EVOL_ENUM_GENDER diff --git a/src/emap/pc.c b/src/emap/pc.c index 5a8b527..fda6818 100644 --- a/src/emap/pc.c +++ b/src/emap/pc.c @@ -66,7 +66,7 @@ static int epc_changesex(TBL_PC *sd, unsigned char sex) switch (sex) { case GENDER_FEMALE: case GENDER_MALE: - case GENDER_NONBINARY: + case GENDER_HIDDEN: sd->status.sex = sex; break; default: diff --git a/src/emap/script.c b/src/emap/script.c index 00d26e6..9e6add6 100644 --- a/src/emap/script.c +++ b/src/emap/script.c @@ -95,7 +95,7 @@ void escript_hardcoded_constants_pre(void) script->set_constant("Gender", SP_SEX, true, false); script->set_constant("GENDER_FEMALE", GENDER_FEMALE, false, false); script->set_constant("GENDER_MALE", GENDER_MALE, false, false); - script->set_constant("GENDER_NONBINARY", GENDER_NONBINARY, false, false); + script->set_constant("GENDER_HIDDEN", GENDER_HIDDEN, false, false); script->constdb_comment(NULL); eskill_addskill_conststants(); } -- cgit v1.2.3-70-g09d2