*Temp fix for crash caused by AV creature. Need to find a way to allow summoned creatures to use RandomMovement.
--HG-- branch : trunk
This commit is contained in:
+10
-10
@@ -304,11 +304,11 @@ class ObjectMgr
|
||||
|
||||
typedef std::set< Group * > GroupSet;
|
||||
typedef std::set< Guild * > GuildSet;
|
||||
typedef std::set< ArenaTeam * > ArenaTeamSet;
|
||||
|
||||
typedef UNORDERED_MAP<uint32, ArenaTeam* > ArenaTeamMap;
|
||||
|
||||
typedef UNORDERED_MAP<uint32, Quest*> QuestMap;
|
||||
|
||||
|
||||
typedef UNORDERED_MAP<uint32, AreaTrigger> AreaTriggerMap;
|
||||
|
||||
typedef UNORDERED_MAP<uint32, uint32> AreaTriggerScriptMap;
|
||||
@@ -340,13 +340,13 @@ class ObjectMgr
|
||||
void AddGuild(Guild* guild) { mGuildSet.insert( guild ); }
|
||||
void RemoveGuild(Guild* guild) { mGuildSet.erase( guild ); }
|
||||
|
||||
ArenaTeam* GetArenaTeamById(const uint32 ArenaTeamId) const;
|
||||
ArenaTeam* GetArenaTeamByName(const std::string& ArenaTeamName) const;
|
||||
ArenaTeam* GetArenaTeamByCapitan(uint64 const& guid) const;
|
||||
void AddArenaTeam(ArenaTeam* arenateam) { mArenaTeamSet.insert( arenateam ); }
|
||||
void RemoveArenaTeam(ArenaTeam* arenateam) { mArenaTeamSet.erase( arenateam ); }
|
||||
ArenaTeamSet::iterator GetArenaTeamSetBegin() { return mArenaTeamSet.begin(); }
|
||||
ArenaTeamSet::iterator GetArenaTeamSetEnd() { return mArenaTeamSet.end(); }
|
||||
ArenaTeam* GetArenaTeamById(const uint32 arenateamid) const;
|
||||
ArenaTeam* GetArenaTeamByName(const std::string& arenateamname) const;
|
||||
ArenaTeam* GetArenaTeamByCaptain(uint64 const& guid) const;
|
||||
void AddArenaTeam(ArenaTeam* arenaTeam);
|
||||
void RemoveArenaTeam(ArenaTeam* arenaTeam);
|
||||
ArenaTeamMap::iterator GetArenaTeamMapBegin() { return mArenaTeamMap.begin(); }
|
||||
ArenaTeamMap::iterator GetArenaTeamMapEnd() { return mArenaTeamMap.end(); }
|
||||
|
||||
static CreatureInfo const *GetCreatureTemplate( uint32 id );
|
||||
CreatureModelInfo const *GetCreatureModelInfo( uint32 modelid );
|
||||
@@ -835,7 +835,7 @@ class ObjectMgr
|
||||
|
||||
GroupSet mGroupSet;
|
||||
GuildSet mGuildSet;
|
||||
ArenaTeamSet mArenaTeamSet;
|
||||
ArenaTeamMap mArenaTeamMap;
|
||||
|
||||
ItemMap mItems;
|
||||
ItemMap mAitems;
|
||||
|
||||
Reference in New Issue
Block a user