diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index f58b04c36..bf3f48c67 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -1141,14 +1141,10 @@ BattleGroundMgr::~BattleGroundMgr() void BattleGroundMgr::DeleteAllBattleGrounds() { // will also delete template bgs: - for(uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++) + for(uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; ++i) { - for(BattleGroundSet::iterator itr = m_BattleGrounds[i].begin(); itr != m_BattleGrounds[i].end();) - { - BattleGround * bg = itr->second; - itr++; - delete bg; - } + for(BattleGroundSet::iterator itr = m_BattleGrounds[i].begin(); itr != m_BattleGrounds[i].end(); ++itr) + delete itr->second; } } diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index 561f6f9c5..c5875cc54 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -972,7 +972,7 @@ template <> int16 GameEventMgr::GetGameEventId(uint32 guid_or_poolid) { for (uint16 i = 0; i < mGameEventCreatureGuids.size(); i++) // 0 <= i <= 2*(S := mGameEvent.size()) - 2 - for (GuidList::const_iterator itr = mGameEventCreatureGuids[i].begin(); itr != mGameEventCreatureGuids[i].end(); itr++) + for (GuidList::const_iterator itr = mGameEventCreatureGuids[i].begin(); itr != mGameEventCreatureGuids[i].end(); ++itr) if (*itr == guid_or_poolid) return i + 1 - mGameEvent.size(); // -S *1 + 1 <= . <= 1*S - 1 return 0; @@ -983,7 +983,7 @@ template <> int16 GameEventMgr::GetGameEventId(uint32 guid_or_poolid) { for (uint16 i = 0; i < mGameEventGameobjectGuids.size(); i++) - for (GuidList::const_iterator itr = mGameEventGameobjectGuids[i].begin(); itr != mGameEventGameobjectGuids[i].end(); itr++) + for (GuidList::const_iterator itr = mGameEventGameobjectGuids[i].begin(); itr != mGameEventGameobjectGuids[i].end(); ++itr) if (*itr == guid_or_poolid) return i + 1 - mGameEvent.size(); // -S *1 + 1 <= . <= 1*S - 1 return 0; @@ -994,7 +994,7 @@ template <> int16 GameEventMgr::GetGameEventId(uint32 guid_or_poolid) { for (uint16 i = 0; i < mGameEventSpawnPoolIds.size(); i++) - for (IdList::const_iterator itr = mGameEventSpawnPoolIds[i].begin(); itr != mGameEventSpawnPoolIds[i].end(); itr++) + for (IdList::const_iterator itr = mGameEventSpawnPoolIds[i].begin(); itr != mGameEventSpawnPoolIds[i].end(); ++itr) if (*itr == guid_or_poolid) return i; return 0; diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 105b641f3..b11d80883 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -824,7 +824,7 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8 } } - for (PlayerCreateInfoItems::const_iterator item_id_itr = info->item.begin(); item_id_itr!=info->item.end(); ++item_id_itr++) + for (PlayerCreateInfoItems::const_iterator item_id_itr = info->item.begin(); item_id_itr != info->item.end(); ++item_id_itr) StoreNewItemInBestSlots(item_id_itr->item_id, item_id_itr->item_amount); // bags and main-hand weapon must equipped at this moment diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 590fa7fb8..c3f0f178b 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 "11482" + #define REVISION_NR "11483" #endif // __REVISION_NR_H__