diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-04-10 17:54:45 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-04-10 17:54:45 +0200 |
| commit | 38def5969a3e3c7aa07f9ab6fdad0103ef265b21 (patch) | |
| tree | 3813b16bebd09dbd5c0cca2b4cb0dfbff84a4233 /src/server/collision | |
| parent | a85e1cf8bc12642925fb0fa75fff964f7469b795 (diff) | |
Warning fixes
Diffstat (limited to 'src/server/collision')
| -rw-r--r-- | src/server/collision/Management/MMapManager.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/server/collision/Management/MMapManager.cpp b/src/server/collision/Management/MMapManager.cpp index b3a012d6a3f..bb752fd9b49 100644 --- a/src/server/collision/Management/MMapManager.cpp +++ b/src/server/collision/Management/MMapManager.cpp @@ -163,13 +163,9 @@ namespace MMAP return true; } - else - { - TC_LOG_ERROR("maps", "MMAP:loadMap: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y); - dtFree(data); - return false; - } + TC_LOG_ERROR("maps", "MMAP:loadMap: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y); + dtFree(data); return false; } @@ -233,9 +229,9 @@ namespace MMAP for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i) { - if (const MapEntry* const map = sMapStore.LookupEntry(i)) + if (MapEntry const* map = sMapStore.LookupEntry(i)) { - if (map->ParentMapID == mapId) + if (map->ParentMapID == int32(mapId)) { PhasedTile* data = LoadTile(map->ID, x, y); // only a few tiles have terrain swaps, do not write error for them |
