diff options
author | KingPin <none@none> | 2008-11-10 06:53:00 -0600 |
---|---|---|
committer | KingPin <none@none> | 2008-11-10 06:53:00 -0600 |
commit | 09280b0091474b58d43daf42c0f3d99f86e6ec25 (patch) | |
tree | a6b9b17869b7e035811baa36bc1a0e2b618af216 /src/game/ObjectMgr.h | |
parent | f2250030cd7ea58eb9de63a96c34656ac1916369 (diff) |
[svn] * Switch from hashmap to unordered map. - cleanup source - mangos. Help - Aokromes
--HG--
branch : trunk
rename : src/framework/Utilities/HashMap.h => src/framework/Utilities/UnorderedMap.h
Diffstat (limited to 'src/game/ObjectMgr.h')
-rw-r--r-- | src/game/ObjectMgr.h | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index c40ba87d7f2..a5d8a679fdd 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -74,7 +74,7 @@ struct GameTele std::wstring wnameLow; }; -typedef HM_NAMESPACE::hash_map<uint32, GameTele > GameTeleMap; +typedef UNORDERED_MAP<uint32, GameTele > GameTeleMap; typedef std::list<GossipOption> CacheNpcOptionList; struct ScriptInfo @@ -123,26 +123,26 @@ struct CellObjectGuids CellGuidSet gameobjects; CellCorpseSet corpses; }; -typedef HM_NAMESPACE::hash_map<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap; -typedef HM_NAMESPACE::hash_map<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids; +typedef UNORDERED_MAP<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap; +typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids; -typedef HM_NAMESPACE::hash_map<uint64/*(instance,guid) pair*/,time_t> RespawnTimes; +typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes; struct TrinityStringLocale { std::vector<std::string> Content; // 0 -> default, i -> i-1 locale index }; -typedef HM_NAMESPACE::hash_map<uint32,CreatureData> CreatureDataMap; -typedef HM_NAMESPACE::hash_map<uint32,GameObjectData> GameObjectDataMap; -typedef HM_NAMESPACE::hash_map<uint32,CreatureLocale> CreatureLocaleMap; -typedef HM_NAMESPACE::hash_map<uint32,GameObjectLocale> GameObjectLocaleMap; -typedef HM_NAMESPACE::hash_map<uint32,ItemLocale> ItemLocaleMap; -typedef HM_NAMESPACE::hash_map<uint32,QuestLocale> QuestLocaleMap; -typedef HM_NAMESPACE::hash_map<uint32,NpcTextLocale> NpcTextLocaleMap; -typedef HM_NAMESPACE::hash_map<uint32,PageTextLocale> PageTextLocaleMap; -typedef HM_NAMESPACE::hash_map<uint32,TrinityStringLocale> TrinityStringLocaleMap; -typedef HM_NAMESPACE::hash_map<uint32,NpcOptionLocale> NpcOptionLocaleMap; +typedef UNORDERED_MAP<uint32,CreatureData> CreatureDataMap; +typedef UNORDERED_MAP<uint32,GameObjectData> GameObjectDataMap; +typedef UNORDERED_MAP<uint32,CreatureLocale> CreatureLocaleMap; +typedef UNORDERED_MAP<uint32,GameObjectLocale> GameObjectLocaleMap; +typedef UNORDERED_MAP<uint32,ItemLocale> ItemLocaleMap; +typedef UNORDERED_MAP<uint32,QuestLocale> QuestLocaleMap; +typedef UNORDERED_MAP<uint32,NpcTextLocale> NpcTextLocaleMap; +typedef UNORDERED_MAP<uint32,PageTextLocale> PageTextLocaleMap; +typedef UNORDERED_MAP<uint32,TrinityStringLocale> TrinityStringLocaleMap; +typedef UNORDERED_MAP<uint32,NpcOptionLocale> NpcOptionLocaleMap; typedef std::multimap<uint32,uint32> QuestRelations; @@ -228,7 +228,7 @@ typedef struct _tagCachePlayerInfo uint32 unArenaInfoSlot1; uint32 unArenaInfoSlot2; }CachePlayerInfo, *PCachePlayerInfo; -typedef HM_NAMESPACE::hash_map<uint32, PCachePlayerInfo> CachePlayerInfoMap; +typedef UNORDERED_MAP<uint32, PCachePlayerInfo> CachePlayerInfoMap; struct PlayerCondition { @@ -249,11 +249,11 @@ struct PlayerCondition }; // NPC gossip text id -typedef HM_NAMESPACE::hash_map<uint32, uint32> CacheNpcTextIdMap; +typedef UNORDERED_MAP<uint32, uint32> CacheNpcTextIdMap; -typedef HM_NAMESPACE::hash_map<uint32, VendorItemData> CacheVendorItemMap; -typedef HM_NAMESPACE::hash_map<uint32, TrainerSpellData> CacheTrainerSpellMap; +typedef UNORDERED_MAP<uint32, VendorItemData> CacheVendorItemMap; +typedef UNORDERED_MAP<uint32, TrainerSpellData> CacheTrainerSpellMap; enum SkillRangeType { @@ -291,23 +291,23 @@ class ObjectMgr ObjectMgr(); ~ObjectMgr(); - typedef HM_NAMESPACE::hash_map<uint32, Item*> ItemMap; + typedef UNORDERED_MAP<uint32, Item*> ItemMap; typedef std::set< Group * > GroupSet; typedef std::set< Guild * > GuildSet; typedef std::set< ArenaTeam * > ArenaTeamSet; - typedef HM_NAMESPACE::hash_map<uint32, Quest*> QuestMap; + typedef UNORDERED_MAP<uint32, Quest*> QuestMap; - typedef HM_NAMESPACE::hash_map<uint32, AreaTrigger> AreaTriggerMap; + typedef UNORDERED_MAP<uint32, AreaTrigger> AreaTriggerMap; - typedef HM_NAMESPACE::hash_map<uint32, std::string> AreaTriggerScriptMap; + typedef UNORDERED_MAP<uint32, std::string> AreaTriggerScriptMap; - typedef HM_NAMESPACE::hash_map<uint32, ReputationOnKillEntry> RepOnKillMap; + typedef UNORDERED_MAP<uint32, ReputationOnKillEntry> RepOnKillMap; - typedef HM_NAMESPACE::hash_map<uint32, WeatherZoneChances> WeatherZoneMap; + typedef UNORDERED_MAP<uint32, WeatherZoneChances> WeatherZoneMap; - typedef HM_NAMESPACE::hash_map<uint32, PetCreateSpellEntry> PetCreateSpellMap; + typedef UNORDERED_MAP<uint32, PetCreateSpellEntry> PetCreateSpellMap; Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);} Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); } @@ -803,10 +803,10 @@ class ObjectMgr QuestMap mQuestTemplates; - typedef HM_NAMESPACE::hash_map<uint32, GossipText*> GossipTextMap; - typedef HM_NAMESPACE::hash_map<uint32, uint32> QuestAreaTriggerMap; - typedef HM_NAMESPACE::hash_map<uint32, uint32> BattleMastersMap; - typedef HM_NAMESPACE::hash_map<uint32, std::string> ItemTextMap; + typedef UNORDERED_MAP<uint32, GossipText*> GossipTextMap; + typedef UNORDERED_MAP<uint32, uint32> QuestAreaTriggerMap; + typedef UNORDERED_MAP<uint32, uint32> BattleMastersMap; + typedef UNORDERED_MAP<uint32, std::string> ItemTextMap; typedef std::set<uint32> TavernAreaTriggerSet; typedef std::set<uint32> GameObjectForQuestSet; |