aboutsummaryrefslogtreecommitdiff
path: root/src/server/collision
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/collision')
-rw-r--r--src/server/collision/Management/MMapManager.cpp12
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