diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-30 22:59:51 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-30 22:59:51 +0200 |
| commit | 824ee30b7fd6860c5831e10dfaba3b06e8a9aec7 (patch) | |
| tree | 3f2339ac9ab435c99978f495ac45f49f8d5f8a20 /src/server/game/Handlers/QueryHandler.cpp | |
| parent | cdae208b9a47cf056330b4ded6b0f8201a7ad9e6 (diff) | |
| parent | 5caf6aad98eba766017b6a3acc04dd0e30086142 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/game/Handlers/QueryHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/QueryHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index 0288e3c86cd..b2eb89efb31 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -305,8 +305,8 @@ void WorldSession::HandleNpcTextQueryOpcode(WorldPacket& recvData) BroadcastText const* bct = sObjectMgr->GetBroadcastText(gossip->Options[i].BroadcastTextID); if (bct) { - ObjectMgr::GetLocaleString(bct->MaleText, locale, text0[i]); - ObjectMgr::GetLocaleString(bct->FemaleText, locale, text1[i]); + text0[i] = bct->GetText(locale, GENDER_MALE, true); + text1[i] = bct->GetText(locale, GENDER_FEMALE, true); } else { |