Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Cleanup, proper indentation, and remove some wrong/irrelevant comments copied from custom patches..

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-12-18 13:41:30 -08:00
parent 89464472a9
commit dc1207139a
30 changed files with 195 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/game/MapManager.cpp
View File

@@ -186,8 +186,8 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
sLog.outDebug("MAP: Player '%s' must be in a raid group to enter instance of '%s'", player->GetName(), mapName);
return false;
}
// Åñëè ÈÊ èëè È×, òî ïðîâåðÿòü óðîâåíü øìîòà îäåòîãî íà ïåðñå.
//if(mapid==649)
// Åñëè ÈÊ èëè È×, òî ïðîâåðÿòü óðîâåíü øìîòà îäåòîãî íà ïåðñå.
//if (mapid == 649)
}
}
@@ -234,7 +234,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
sLog.outDebug("Map::CanEnter - player '%s' is dead but doesn't have a corpse!", player->GetName());
}
}
InstanceTemplate const* instance = objmgr.GetInstanceTemplate(mapid);
if(!instance)
return false;
@@ -255,7 +255,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
//TODO: send some kind of error message to the player
return false;
}
//Encounters in progress
if (entry->map_type == MAP_RAID && ((InstanceMap*)boundedMap)->GetInstanceData() && ((InstanceMap*)boundedMap)->GetInstanceData()->IsEncounterInProgress())
{
@@ -263,7 +263,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
player->SendTransferAborted(mapid, TRANSFER_ABORT_ZONE_IN_COMBAT);
return(false);
}
//Instance is full
MapDifficulty const* mapDiff = ((InstanceMap*)player)->GetMapDifficulty();
int8 maxPlayers = mapDiff ? mapDiff->maxPlayers : 0;
@@ -308,15 +308,15 @@ MapManager::Update(uint32 diff)
#ifdef MULTI_THREAD_MAP
for(; iter != i_maps.end(); ++iter)
{
if (m_updater.activated())
m_updater.schedule_update(*iter->second, i_timer.GetCurrent());
if (m_updater.activated())
m_updater.schedule_update(*iter->second, i_timer.GetCurrent());
else
{
{
iter->second->Update(i_timer.GetCurrent());
}
}
}
if (m_updater.activated())
m_updater.wait();
m_updater.wait();
#else
for (; iter != i_maps.end(); ++iter)
{