Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
This commit is contained in:
Vincent-Michael committed 2014-04-30 22:59:51 +02:00
2 parents cdae208b9a 5caf6aad98
commit 824ee30b7f
8 files changed
+31 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Handlers/QueryHandler.cpp
+2 -2
View File
@@ -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
{