diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-03 20:23:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-03 20:23:44 +0200 |
| commit | 13ec761ad2cc2aec24f850520f459bb124050a34 (patch) | |
| tree | d22b616621787ecdf81579ae08d3c46b93d471b3 /src/server/game/Texts | |
| parent | 9a8cd0593c985a05dfc0fc9a45dd8d905974505b (diff) | |
| parent | d7b1405725d2f247776f3586df8c3512416f60cd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.h
Diffstat (limited to 'src/server/game/Texts')
| -rw-r--r-- | src/server/game/Texts/CreatureTextMgr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 2558d24500d..28722ae70f4 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -70,15 +70,15 @@ struct CreatureTextId }; typedef std::vector<CreatureTextEntry> CreatureTextGroup; //texts in a group -typedef UNORDERED_MAP<uint8, CreatureTextGroup> CreatureTextHolder; //groups for a creature by groupid -typedef UNORDERED_MAP<uint32, CreatureTextHolder> CreatureTextMap; //all creatures by entry +typedef std::unordered_map<uint8, CreatureTextGroup> CreatureTextHolder; //groups for a creature by groupid +typedef std::unordered_map<uint32, CreatureTextHolder> CreatureTextMap; //all creatures by entry typedef std::map<CreatureTextId, CreatureTextLocale> LocaleCreatureTextMap; //used for handling non-repeatable random texts typedef std::vector<uint8> CreatureTextRepeatIds; -typedef UNORDERED_MAP<uint8, CreatureTextRepeatIds> CreatureTextRepeatGroup; -typedef UNORDERED_MAP<uint64, CreatureTextRepeatGroup> CreatureTextRepeatMap;//guid based +typedef std::unordered_map<uint8, CreatureTextRepeatIds> CreatureTextRepeatGroup; +typedef std::unordered_map<uint64, CreatureTextRepeatGroup> CreatureTextRepeatMap;//guid based class CreatureTextMgr { |