diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-06-13 12:27:19 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-03 01:05:22 +0100 |
| commit | 0b745370dc8629be7f64c941f8e6bd65b172a77d (patch) | |
| tree | 933e84a0dc3dcd850bf61fbd7fbace1ef0359a2b /src/server/game/Texts/CreatureTextMgr.h | |
| parent | f803178819ac1633709ee3a7fe1f296e5832536e (diff) | |
Core/Texts: Fix race conditions in CreatureTextMgr repeat group
Fix race conditions in CreatureTextMgr repeat group happening with MapThreads > 1 reported by helgrind by moving Creature-GUID-base data from CreatureTextMgr to Creature.
Issues added in bbf86641a1c35fcc66de30d7a79175c31effde88
(cherry picked from commit d123c811623fcedcf125f56101b6aea773f460e0)
Conflicts:
src/server/game/Texts/CreatureTextMgr.cpp
Diffstat (limited to 'src/server/game/Texts/CreatureTextMgr.h')
| -rw-r--r-- | src/server/game/Texts/CreatureTextMgr.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index f2963006599..366ef22cc70 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -76,11 +76,6 @@ typedef std::unordered_map<uint32, CreatureTextHolder> CreatureTextMap; // a typedef std::map<CreatureTextId, CreatureTextLocale> LocaleCreatureTextMap; -//used for handling non-repeatable random texts -typedef std::vector<uint8> CreatureTextRepeatIds; -typedef std::unordered_map<uint8, CreatureTextRepeatIds> CreatureTextRepeatGroup; -typedef std::unordered_map<ObjectGuid, CreatureTextRepeatGroup> CreatureTextRepeatMap;//guid based - class CreatureTextMgr { private: @@ -116,7 +111,6 @@ class CreatureTextMgr static float GetRangeForChatType(ChatMsg msgType); CreatureTextMap mTextMap; - CreatureTextRepeatMap mTextRepeatMap; LocaleCreatureTextMap mLocaleTextMap; }; |