diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 16:55:17 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 16:55:17 +0100 |
| commit | 24e0eb1812f94c5092009f78ced3306f142d2789 (patch) | |
| tree | 0118c5abc4e0bb3e8e2a218ca2c9c1934f8eb0d1 /src/server/game/Maps/MapManager.cpp | |
| parent | 8db66bfefdb9ec7a722dd93aadbbd818c567fba0 (diff) | |
| parent | 7dd0cd4403d7f28343a751e7b85aeb30d3968ff5 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
| -rw-r--r-- | src/server/game/Maps/MapManager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index a7b7e4044b8..755d443091a 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -179,6 +179,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck) else // attempt to downscale mapDiff = GetDownscaledMapDifficultyData(entry->MapID, targetDifficulty); } + // FIXME: mapDiff is never used //Bypass checks for GMs if (player->isGameMaster()) |