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

[11094] Fix some C6246 warnings

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
src/game/AchievementMgr.cpp
View file

@ -844,9 +844,9 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
return;
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);
if (!achievement)

6
src/game/Unit.cpp
View file

@ -9808,14 +9808,14 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
return;
// 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)
SpellAuraHolder *triggeredByHolder = i->triggeredByHolder;
SpellAuraHolder *triggeredByHolder = itr->triggeredByHolder;
if(triggeredByHolder->IsDeleted())
continue;
SpellProcEventEntry const *spellProcEvent = i->spellProcEvent;
SpellProcEventEntry const *spellProcEvent = itr->spellProcEvent;
bool useCharges = triggeredByHolder->GetAuraCharges() > 0;
bool procSuccess = true;
bool anyAuraProc = false;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11093"
#define REVISION_NR "11094"
#endif // __REVISION_NR_H__