diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-10-16 11:28:30 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-10-03 17:34:49 +0200 |
| commit | c37d6a737a9c52c515ce8c3293f044112cc9677f (patch) | |
| tree | 519463f224139e34d513369597c291a0a6909fae /src | |
| parent | ab15413aad46f6802f940a46153a61e84dea3eb2 (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.
(cherry picked from commit b54131057875d5bd51420540801d15a516d63eb0)
# Conflicts:
# src/server/game/Globals/ObjectMgr.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index d83ab0c88d4..11fbdd008b1 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -1177,7 +1177,7 @@ ArtifactPowerRankEntry const* DB2Manager::GetArtifactPowerRank(uint32 artifactPo char const* DB2Manager::GetBroadcastTextValue(BroadcastTextEntry const* broadcastText, LocaleConstant locale /*= DEFAULT_LOCALE*/, uint8 gender /*= GENDER_MALE*/, bool forceGender /*= false*/) { - if (gender == GENDER_FEMALE && (forceGender || broadcastText->FemaleText->Str[DEFAULT_LOCALE][0] != '\0')) + if ((gender == GENDER_FEMALE || gender == GENDER_NONE) && (forceGender || broadcastText->FemaleText->Str[DEFAULT_LOCALE][0] != '\0')) { if (broadcastText->FemaleText->Str[locale][0] != '\0') return broadcastText->FemaleText->Str[locale]; |