diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-09-13 13:55:17 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-09-13 13:55:17 +0100 |
| commit | b9b2a87d42740e97dd047369d98c74bd18e11773 (patch) | |
| tree | 20b1efa3ca05f7dfaceb8b5405ff167b482d24ff /src/server/game/Scripting/MapScripts.cpp | |
| parent | 08bbe41dedc39b913a154a4eb4d0954a8731b2dd (diff) | |
| parent | dbbc5bfb506b9b7091664e2c8efb9b92bf41c6cf (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Diffstat (limited to 'src/server/game/Scripting/MapScripts.cpp')
| -rw-r--r-- | src/server/game/Scripting/MapScripts.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 3ccc876e1a2..b32fa288185 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -383,7 +383,8 @@ void Map::ScriptsProcess() if (Player* player = _GetScriptPlayerSourceOrTarget(source, target, step.script)) { LocaleConstant loc_idx = player->GetSession()->GetSessionDbLocaleIndex(); - std::string text(sObjectMgr->GetTrinityString(step.script->Talk.TextID, loc_idx)); + BroadcastText const* broadcastText = sObjectMgr->GetBroadcastText(step.script->Talk.TextID); + std::string text = broadcastText->GetText(loc_idx, player->getGender()); switch (step.script->Talk.ChatType) { |