[11094] Fix some C6246 warnings

This commit is contained in:
zergtmn 2011-02-01 20:11:24 +05:00
parent 343edf3c6c
commit ad64af1fdb
3 changed files with 6 additions and 6 deletions

View file

@ -844,9 +844,9 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
return; return;
AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr.GetAchievementCriteriaByType(type); AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr.GetAchievementCriteriaByType(type);
for(AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i!=achievementCriteriaList.end(); ++i) for(AchievementCriteriaEntryList::const_iterator itr = achievementCriteriaList.begin(); itr != achievementCriteriaList.end(); ++itr)
{ {
AchievementCriteriaEntry const *achievementCriteria = (*i); AchievementCriteriaEntry const *achievementCriteria = *itr;
AchievementEntry const *achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement); AchievementEntry const *achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement);
if (!achievement) if (!achievement)

View file

@ -9808,14 +9808,14 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
return; return;
// Handle effects proceed this time // Handle effects proceed this time
for(ProcTriggeredList::const_iterator i = procTriggered.begin(); i != procTriggered.end(); ++i) for(ProcTriggeredList::const_iterator itr = procTriggered.begin(); itr != procTriggered.end(); ++itr)
{ {
// Some auras can be deleted in function called in this loop (except first, ofc) // Some auras can be deleted in function called in this loop (except first, ofc)
SpellAuraHolder *triggeredByHolder = i->triggeredByHolder; SpellAuraHolder *triggeredByHolder = itr->triggeredByHolder;
if(triggeredByHolder->IsDeleted()) if(triggeredByHolder->IsDeleted())
continue; continue;
SpellProcEventEntry const *spellProcEvent = i->spellProcEvent; SpellProcEventEntry const *spellProcEvent = itr->spellProcEvent;
bool useCharges = triggeredByHolder->GetAuraCharges() > 0; bool useCharges = triggeredByHolder->GetAuraCharges() > 0;
bool procSuccess = true; bool procSuccess = true;
bool anyAuraProc = false; bool anyAuraProc = false;

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 "11093" #define REVISION_NR "11094"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__