[7123] Cleanup in using STD's containers erase method.

Signed-off-by: ApoC <apoc@nymfe.net>

src/game/AuctionHouseObject.h

@@ -82,20 +82,12 @@ class AuctionHouseObject
         AuctionEntry* GetAuction(uint32 id) const
         {
             AuctionEntryMap::const_iterator itr = AuctionsMap.find( id );
-            if( itr != AuctionsMap.end() )
+            return itr != AuctionsMap.end() ? itr->second : NULL;
-                return itr->second;
-            return NULL;
         }
 
         bool RemoveAuction(uint32 id)
         {
-            AuctionEntryMap::iterator i = AuctionsMap.find(id);
+            return AuctionsMap.erase(id) ? true : false;
-            if (i == AuctionsMap.end())
-            {
-                return false;
-            }
-            AuctionsMap.erase(i);
-            return true;
         }
 
     private:

src/game/ObjectAccessor.cpp

@@ -274,22 +274,6 @@ ObjectAccessor::UpdateObject(Object* obj, Player* exceptPlayer)
     }
 }
 
-void
-ObjectAccessor::AddUpdateObject(Object *obj)
-{
-    Guard guard(i_updateGuard);
-    i_objects.insert(obj);
-}
-
-void
-ObjectAccessor::RemoveUpdateObject(Object *obj)
-{
-    Guard guard(i_updateGuard);
-    std::set<Object *>::iterator iter = i_objects.find(obj);
-    if( iter != i_objects.end() )
-        i_objects.erase( iter );
-}
-
 void
 ObjectAccessor::_buildUpdateObject(Object *obj, UpdateDataMapType &update_players)
 {

src/game/ObjectAccessor.h

@@ -57,9 +57,7 @@ class HashMapHolder
         static void Remove(T* o)
         {
             Guard guard(i_lock);
-            typename MapType::iterator itr = m_objectMap.find(o->GetGUID());
+            m_objectMap.erase(o->GetGUID());
-            if (itr != m_objectMap.end())
-                m_objectMap.erase(itr);
         }
 
         static T* Find(uint64 guid)
@@ -174,16 +172,22 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor,
             HashMapHolder<Player>::Remove(pl);
 
             Guard guard(i_updateGuard);
-
+            i_objects.erase((Object *)pl);
-            std::set<Object *>::iterator iter2 = std::find(i_objects.begin(), i_objects.end(), (Object *)pl);
-            if( iter2 != i_objects.end() )
-                i_objects.erase(iter2);
         }
 
         void SaveAllPlayers();
 
-        void AddUpdateObject(Object *obj);
+        void AddUpdateObject(Object *obj)
-        void RemoveUpdateObject(Object *obj);
+        {
+            Guard guard(i_updateGuard);
+            i_objects.insert(obj);
+        }
+
+        void RemoveUpdateObject(Object *obj)
+        {
+            Guard guard(i_updateGuard);
+            i_objects.erase( obj );
+        }
 
         void Update(uint32 diff);
         void UpdatePlayers(uint32 diff);

src/game/Player.h

@@ -1454,10 +1454,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         Item* GetMItem(uint32 id)
         {
             ItemMap::const_iterator itr = mMitems.find(id);
-            if (itr != mMitems.end())
+            return itr != mMitems.end() ? itr->second : NULL;
-                return itr->second;
-
-            return NULL;
         }
 
         void AddMItem(Item* it)
@@ -1469,12 +1466,7 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         bool RemoveMItem(uint32 id)
         {
-            ItemMap::iterator i = mMitems.find(id);
+            return mMitems.erase(id) ? true : false;
-            if (i == mMitems.end())
-                return false;
-
-            mMitems.erase(i);
-            return true;
         }
 
         void PetSpellInitialize();

src/game/SocialMgr.cpp

@@ -180,13 +180,6 @@ SocialMgr::~SocialMgr()
 
 }
 
-void SocialMgr::RemovePlayerSocial(uint32 guid)
-{
-    SocialMap::iterator itr = m_socialMap.find(guid);
-    if(itr != m_socialMap.end())
-        m_socialMap.erase(itr);
-}
-
 void SocialMgr::GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &friendInfo)
 {
     if(!player)

src/game/SocialMgr.h

@@ -141,7 +141,8 @@ class SocialMgr
         SocialMgr();
         ~SocialMgr();
         // Misc
-        void RemovePlayerSocial(uint32 guid);
+        void RemovePlayerSocial(uint32 guid) { m_socialMap.erase(guid); }
+
         void GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &friendInfo);
         // Packet management
         void MakeFriendStatusPacket(FriendsResult result, uint32 friend_guid, WorldPacket *data);

src/game/Transports.cpp

@@ -473,11 +473,8 @@ bool Transport::AddPassenger(Player* passenger)
 
 bool Transport::RemovePassenger(Player* passenger)
 {
-    if (m_passengers.find(passenger) != m_passengers.end())
+    if (m_passengers.erase(passenger))
-    {
         sLog.outDetail("Player %s removed from transport %s.", passenger->GetName(), m_name.c_str());
-        m_passengers.erase(passenger);
-    }
     return true;
 }
 

src/game/Unit.h

@@ -803,9 +803,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         }
         void _removeAttacker(Unit *pAttacker)               // must be called only from Unit::AttackStop()
         {
-            AttackerSet::iterator itr = m_attackers.find(pAttacker);
+            m_attackers.erase(pAttacker);
-            if(itr != m_attackers.end())
-                m_attackers.erase(itr);
         }
         Unit * getAttackerForHelper()                       // If someone wants to help, who to give them
         {
@@ -1240,14 +1238,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void SetVisibleAura(uint8 slot, uint32 spellid)
         {
             if(spellid == 0)
-            {
+                m_visibleAuras.erase(slot);
-                VisibleAuraMap::iterator itr = m_visibleAuras.find(slot);
-                if(itr != m_visibleAuras.end())
-                {
-                    m_visibleAuras.erase(itr);
-                    return;
-                }
-            }
             else
                 m_visibleAuras[slot] = spellid;
         }

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7122"
+ #define REVISION_NR "7123"
 #endif // __REVISION_NR_H__