diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-10-16 11:28:30 +0200 |
|---|---|---|
| committer | SnapperRy <snapperryen@gmail.com> | 2016-10-16 11:28:30 +0200 |
| commit | b54131057875d5bd51420540801d15a516d63eb0 (patch) | |
| tree | e1bd01a67598b938ff29c914816c9ea8c9fe9608 | |
| parent | dc0b1e05f6d4195c7b1fb90292233c088f83643f (diff) | |
Core/Text: allow GENDER_NONE to use FemaleText in broadcast_text if not empty.
Otherwise it would only use MaleText, which breaks cases where female NPCs change model to one that has no gender.
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index ea0a4da8d62..a30d92ad68a 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -428,7 +428,7 @@ struct BroadcastText std::string const& GetText(LocaleConstant locale = DEFAULT_LOCALE, uint8 gender = GENDER_MALE, bool forceGender = false) const { - if (gender == GENDER_FEMALE && (forceGender || !FemaleText[DEFAULT_LOCALE].empty())) + if ((gender == GENDER_FEMALE || gender == GENDER_NONE) && (forceGender || !FemaleText[DEFAULT_LOCALE].empty())) { if (FemaleText.size() > size_t(locale) && !FemaleText[locale].empty()) return FemaleText[locale]; |