From c37d6a737a9c52c515ce8c3293f044112cc9677f Mon Sep 17 00:00:00 2001 From: SnapperRy Date: Sun, 16 Oct 2016 11:28:30 +0200 Subject: 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 --- src/server/game/DataStores/DB2Stores.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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]; -- cgit v1.2.3