From 584e2cc1d211864d9d61d9e0441ca2859c3ae033 Mon Sep 17 00:00:00 2001 From: Balrok Date: Tue, 20 Jan 2009 20:04:12 +0100 Subject: [PATCH] [7123] Cleanup in using STD's containers erase method. Signed-off-by: ApoC --- src/game/AuctionHouseObject.h | 12 ++---------- src/game/ObjectAccessor.cpp | 16 ---------------- src/game/ObjectAccessor.h | 22 +++++++++++++--------- src/game/Player.h | 12 ++---------- src/game/SocialMgr.cpp | 7 ------- src/game/SocialMgr.h | 3 ++- src/game/Transports.cpp | 5 +---- src/game/Unit.h | 13 ++----------- src/shared/revision_nr.h | 2 +- 9 files changed, 23 insertions(+), 69 deletions(-) diff --git a/src/game/AuctionHouseObject.h b/src/game/AuctionHouseObject.h index 077991e8c..927063eb6 100644 --- a/src/game/AuctionHouseObject.h +++ b/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->second; - return NULL; + return itr != AuctionsMap.end() ? itr->second : NULL; } bool RemoveAuction(uint32 id) { - AuctionEntryMap::iterator i = AuctionsMap.find(id); - if (i == AuctionsMap.end()) - { - return false; - } - AuctionsMap.erase(i); - return true; + return AuctionsMap.erase(id) ? true : false; } private: diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index 53b6c245f..447ec2059 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -275,22 +275,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::iterator iter = i_objects.find(obj); - if( iter != i_objects.end() ) - i_objects.erase( iter ); -} - -void ObjectAccessor::_buildUpdateObject(Object *obj, UpdateDataMapType &update_players) { bool build_for_all = true; diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h index eb09f6385..102da6984 100644 --- a/src/game/ObjectAccessor.h +++ b/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()); - if (itr != m_objectMap.end()) - m_objectMap.erase(itr); + m_objectMap.erase(o->GetGUID()); } static T* Find(uint64 guid) @@ -174,16 +172,22 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton::Remove(pl); Guard guard(i_updateGuard); - - std::set::iterator iter2 = std::find(i_objects.begin(), i_objects.end(), (Object *)pl); - if( iter2 != i_objects.end() ) - i_objects.erase(iter2); + i_objects.erase((Object *)pl); } void SaveAllPlayers(); - void AddUpdateObject(Object *obj); - void RemoveUpdateObject(Object *obj); + void AddUpdateObject(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); diff --git a/src/game/Player.h b/src/game/Player.h index 2e962a9f3..b5448c2c4 100644 --- a/src/game/Player.h +++ b/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->second; - - return NULL; + return itr != mMitems.end() ? itr->second : 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); - if (i == mMitems.end()) - return false; - - mMitems.erase(i); - return true; + return mMitems.erase(id) ? true : false; } void PetSpellInitialize(); diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index b7dba46a9..e620e8881 100644 --- a/src/game/SocialMgr.cpp +++ b/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) diff --git a/src/game/SocialMgr.h b/src/game/SocialMgr.h index a06cde39a..d76d44625 100644 --- a/src/game/SocialMgr.h +++ b/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); diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp index d0de6afd4..dfe12119a 100644 --- a/src/game/Transports.cpp +++ b/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; } diff --git a/src/game/Unit.h b/src/game/Unit.h index 94b4bcf15..a779ba874 100644 --- a/src/game/Unit.h +++ b/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); - if(itr != m_attackers.end()) - m_attackers.erase(itr); + m_attackers.erase(pAttacker); } 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) - { - VisibleAuraMap::iterator itr = m_visibleAuras.find(slot); - if(itr != m_visibleAuras.end()) - { - m_visibleAuras.erase(itr); - return; - } - } + m_visibleAuras.erase(slot); else m_visibleAuras[slot] = spellid; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e234026a8..5503b0fde 100644 --- a/src/shared/revision_nr.h +++ b/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__ -- 2.11.4.GIT