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/Globals/ObjectMgr.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/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 7204b821138..adf321b1ef3 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -8644,8 +8644,8 @@ void ObjectMgr::LoadBroadcastTexts() bct.Id = fields[0].GetUInt32(); bct.Language = fields[1].GetUInt32(); - AddLocaleString(fields[2].GetString(), DEFAULT_LOCALE, bct.MaleText); - AddLocaleString(fields[3].GetString(), DEFAULT_LOCALE, bct.FemaleText); + bct.MaleText[DEFAULT_LOCALE] = fields[2].GetString(); + bct.FemaleText[DEFAULT_LOCALE] = fields[3].GetString(); bct.EmoteId0 = fields[4].GetUInt32(); bct.EmoteId1 = fields[5].GetUInt32(); bct.EmoteId2 = fields[6].GetUInt32(); |