Show
Ignore:
Timestamp:
11/19/08 13:46:16 (17 years ago)
Author:
yumileroy
Message:

[svn] * Switch from hashmap to unordered map. - cleanup source - mangos. Help - Aokromes

Original author: KingPin?
Date: 2008-11-10 06:53:00-06:00

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/game/ObjectMgr.h

    r168 r206  
    7575}; 
    7676 
    77 typedef HM_NAMESPACE::hash_map<uint32, GameTele > GameTeleMap; 
     77typedef UNORDERED_MAP<uint32, GameTele > GameTeleMap; 
    7878typedef std::list<GossipOption> CacheNpcOptionList; 
    7979 
    … …  
    124124    CellCorpseSet corpses; 
    125125}; 
    126 typedef HM_NAMESPACE::hash_map<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap; 
    127 typedef HM_NAMESPACE::hash_map<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids; 
    128  
    129 typedef HM_NAMESPACE::hash_map<uint64/*(instance,guid) pair*/,time_t> RespawnTimes; 
     126typedef UNORDERED_MAP<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap; 
     127typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids; 
     128 
     129typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes; 
    130130 
    131131struct TrinityStringLocale 
    … …  
    134134}; 
    135135 
    136 typedef HM_NAMESPACE::hash_map<uint32,CreatureData> CreatureDataMap; 
    137 typedef HM_NAMESPACE::hash_map<uint32,GameObjectData> GameObjectDataMap; 
    138 typedef HM_NAMESPACE::hash_map<uint32,CreatureLocale> CreatureLocaleMap; 
    139 typedef HM_NAMESPACE::hash_map<uint32,GameObjectLocale> GameObjectLocaleMap; 
    140 typedef HM_NAMESPACE::hash_map<uint32,ItemLocale> ItemLocaleMap; 
    141 typedef HM_NAMESPACE::hash_map<uint32,QuestLocale> QuestLocaleMap; 
    142 typedef HM_NAMESPACE::hash_map<uint32,NpcTextLocale> NpcTextLocaleMap; 
    143 typedef HM_NAMESPACE::hash_map<uint32,PageTextLocale> PageTextLocaleMap; 
    144 typedef HM_NAMESPACE::hash_map<uint32,TrinityStringLocale> TrinityStringLocaleMap; 
    145 typedef HM_NAMESPACE::hash_map<uint32,NpcOptionLocale> NpcOptionLocaleMap; 
     136typedef UNORDERED_MAP<uint32,CreatureData> CreatureDataMap; 
     137typedef UNORDERED_MAP<uint32,GameObjectData> GameObjectDataMap; 
     138typedef UNORDERED_MAP<uint32,CreatureLocale> CreatureLocaleMap; 
     139typedef UNORDERED_MAP<uint32,GameObjectLocale> GameObjectLocaleMap; 
     140typedef UNORDERED_MAP<uint32,ItemLocale> ItemLocaleMap; 
     141typedef UNORDERED_MAP<uint32,QuestLocale> QuestLocaleMap; 
     142typedef UNORDERED_MAP<uint32,NpcTextLocale> NpcTextLocaleMap; 
     143typedef UNORDERED_MAP<uint32,PageTextLocale> PageTextLocaleMap; 
     144typedef UNORDERED_MAP<uint32,TrinityStringLocale> TrinityStringLocaleMap; 
     145typedef UNORDERED_MAP<uint32,NpcOptionLocale> NpcOptionLocaleMap; 
    146146 
    147147typedef std::multimap<uint32,uint32> QuestRelations; 
    … …  
    229229    uint32 unArenaInfoSlot2; 
    230230}CachePlayerInfo, *PCachePlayerInfo; 
    231 typedef HM_NAMESPACE::hash_map<uint32, PCachePlayerInfo> CachePlayerInfoMap; 
     231typedef UNORDERED_MAP<uint32, PCachePlayerInfo> CachePlayerInfoMap; 
    232232 
    233233struct PlayerCondition 
    … …  
    250250 
    251251// NPC gossip text id 
    252 typedef HM_NAMESPACE::hash_map<uint32, uint32> CacheNpcTextIdMap; 
    253  
    254  
    255 typedef HM_NAMESPACE::hash_map<uint32, VendorItemData> CacheVendorItemMap; 
    256 typedef HM_NAMESPACE::hash_map<uint32, TrainerSpellData> CacheTrainerSpellMap; 
     252typedef UNORDERED_MAP<uint32, uint32> CacheNpcTextIdMap; 
     253 
     254 
     255typedef UNORDERED_MAP<uint32, VendorItemData> CacheVendorItemMap; 
     256typedef UNORDERED_MAP<uint32, TrainerSpellData> CacheTrainerSpellMap; 
    257257 
    258258enum SkillRangeType 
    … …  
    292292        ~ObjectMgr(); 
    293293 
    294         typedef HM_NAMESPACE::hash_map<uint32, Item*> ItemMap; 
     294        typedef UNORDERED_MAP<uint32, Item*> ItemMap; 
    295295 
    296296        typedef std::set< Group * > GroupSet; 
    … …  
    298298        typedef std::set< ArenaTeam * > ArenaTeamSet; 
    299299 
    300         typedef HM_NAMESPACE::hash_map<uint32, Quest*> QuestMap; 
    301  
    302         typedef HM_NAMESPACE::hash_map<uint32, AreaTrigger> AreaTriggerMap; 
    303  
    304         typedef HM_NAMESPACE::hash_map<uint32, std::string> AreaTriggerScriptMap; 
    305  
    306         typedef HM_NAMESPACE::hash_map<uint32, ReputationOnKillEntry> RepOnKillMap; 
    307  
    308         typedef HM_NAMESPACE::hash_map<uint32, WeatherZoneChances> WeatherZoneMap; 
    309  
    310         typedef HM_NAMESPACE::hash_map<uint32, PetCreateSpellEntry> PetCreateSpellMap; 
     300        typedef UNORDERED_MAP<uint32, Quest*> QuestMap; 
     301 
     302        typedef UNORDERED_MAP<uint32, AreaTrigger> AreaTriggerMap; 
     303 
     304        typedef UNORDERED_MAP<uint32, std::string> AreaTriggerScriptMap; 
     305 
     306        typedef UNORDERED_MAP<uint32, ReputationOnKillEntry> RepOnKillMap; 
     307 
     308        typedef UNORDERED_MAP<uint32, WeatherZoneChances> WeatherZoneMap; 
     309 
     310        typedef UNORDERED_MAP<uint32, PetCreateSpellEntry> PetCreateSpellMap; 
    311311 
    312312        Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);} 
    … …  
    804804        QuestMap mQuestTemplates; 
    805805 
    806         typedef HM_NAMESPACE::hash_map<uint32, GossipText*> GossipTextMap; 
    807         typedef HM_NAMESPACE::hash_map<uint32, uint32> QuestAreaTriggerMap; 
    808         typedef HM_NAMESPACE::hash_map<uint32, uint32> BattleMastersMap; 
    809         typedef HM_NAMESPACE::hash_map<uint32, std::string> ItemTextMap; 
     806        typedef UNORDERED_MAP<uint32, GossipText*> GossipTextMap; 
     807        typedef UNORDERED_MAP<uint32, uint32> QuestAreaTriggerMap; 
     808        typedef UNORDERED_MAP<uint32, uint32> BattleMastersMap; 
     809        typedef UNORDERED_MAP<uint32, std::string> ItemTextMap; 
    810810        typedef std::set<uint32> TavernAreaTriggerSet; 
    811811        typedef std::set<uint32> GameObjectForQuestSet;