From 28aba933d6f431bb5df3d04127736756ac3f84ec Mon Sep 17 00:00:00 2001 From: SnapperRy Date: Sun, 16 Oct 2016 11:28:30 +0200 Subject: [PATCH] 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. --- src/server/game/Globals/ObjectMgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 66069e549a4..c12d9ae9c49 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -426,7 +426,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];