mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11483] Change postfix iterator increments to prefix where possible

Browse source
This commit is contained in:
zergtmn 2011-05-14 16:53:52 +06:00
parent 4cfa51d799
commit 777ffe8dc2
4 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/BattleGroundMgr.cpp
View file

@ -1141,14 +1141,10 @@ BattleGroundMgr::~BattleGroundMgr()
void BattleGroundMgr::DeleteAllBattleGrounds() void BattleGroundMgr::DeleteAllBattleGrounds()
{ {
// will also delete template bgs: // 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();) for(BattleGroundSet::iterator itr = m_BattleGrounds[i].begin(); itr != m_BattleGrounds[i].end(); ++itr)
{ delete itr->second;
BattleGround * bg = itr->second;
itr++;
delete bg;
}
} }
} }

6
src/game/GameEventMgr.cpp
View file

@ -972,7 +972,7 @@ template <>
int16 GameEventMgr::GetGameEventId<Creature>(uint32 guid_or_poolid) int16 GameEventMgr::GetGameEventId<Creature>(uint32 guid_or_poolid)
{ {
for (uint16 i = 0; i < mGameEventCreatureGuids.size(); i++) // 0 <= i <= 2*(S := mGameEvent.size()) - 2 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) if (*itr == guid_or_poolid)
return i + 1 - mGameEvent.size(); // -S *1 + 1 <= . <= 1*S - 1 return i + 1 - mGameEvent.size(); // -S *1 + 1 <= . <= 1*S - 1
return 0; return 0;
@ -983,7 +983,7 @@ template <>
int16 GameEventMgr::GetGameEventId<GameObject>(uint32 guid_or_poolid) int16 GameEventMgr::GetGameEventId<GameObject>(uint32 guid_or_poolid)
{ {
for (uint16 i = 0; i < mGameEventGameobjectGuids.size(); i++) 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) if (*itr == guid_or_poolid)
return i + 1 - mGameEvent.size(); // -S *1 + 1 <= . <= 1*S - 1 return i + 1 - mGameEvent.size(); // -S *1 + 1 <= . <= 1*S - 1
return 0; return 0;
@ -994,7 +994,7 @@ template <>
int16 GameEventMgr::GetGameEventId<Pool>(uint32 guid_or_poolid) int16 GameEventMgr::GetGameEventId<Pool>(uint32 guid_or_poolid)
{ {
for (uint16 i = 0; i < mGameEventSpawnPoolIds.size(); i++) 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) if (*itr == guid_or_poolid)
return i; return i;
return 0; return 0;

2
src/game/Player.cpp
View file

@ -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); StoreNewItemInBestSlots(item_id_itr->item_id, item_id_itr->item_amount);
// bags and main-hand weapon must equipped at this moment // bags and main-hand weapon must equipped at this moment

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11482" #define REVISION_NR "11483"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__