Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit
This commit is contained in:
1 parent
f091360940
commit
358b33239a
30 files changed
+220
-226
No files matched your search
@@ -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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user