aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/MapManager.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-11-23 19:17:33 +0100
committerShauren <shauren.trinity@gmail.com>2011-11-23 19:17:33 +0100
commit358b33239aea4e7b5b81f829e0b0079e3ab03830 (patch)
tree1d18bf9c3269a826dc82dc2542a050068aa3ac88 /src/server/game/Maps/MapManager.cpp
parentf091360940322c5b674c93e80b59af66881f9953 (diff)
Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
-rwxr-xr-xsrc/server/game/Maps/MapManager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 1b1aeefb610..f31f1348b44 100755
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -208,8 +208,8 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
if (corpseMap == mapid)
break;
- InstanceTemplate const* instance = sObjectMgr->GetInstanceTemplate(corpseMap);
- corpseMap = instance ? instance->Parent : 0;
+ InstanceTemplate const* corpseInstance = sObjectMgr->GetInstanceTemplate(corpseMap);
+ corpseMap = corpseInstance ? corpseInstance->Parent : 0;
} while (corpseMap);
if (!corpseMap)
@@ -287,8 +287,8 @@ void MapManager::Update(uint32 diff)
iter->second->DelayedUpdate(uint32(i_timer.GetCurrent()));
sObjectAccessor->Update(uint32(i_timer.GetCurrent()));
- for (TransportSet::iterator iter = m_Transports.begin(); iter != m_Transports.end(); ++iter)
- (*iter)->Update(uint32(i_timer.GetCurrent()));
+ for (TransportSet::iterator itr = m_Transports.begin(); itr != m_Transports.end(); ++itr)
+ (*itr)->Update(uint32(i_timer.GetCurrent()));
i_timer.SetCurrent(0);
}