From 130878c1a5d3f1ae42564a14fb6f0a19840f8749 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 25 Jul 2015 15:37:35 +0200 Subject: Core/Collision: Removed direct GameObject references from collision project (cherry picked from commit a029f97c8231f7be188663d63f95f34dd1b4f9e1) Conflicts: src/server/collision/Models/GameObjectModel.cpp --- src/server/collision/Management/VMapManager2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/collision/Management/VMapManager2.cpp') diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index a1cdb5502a9..9594951196f 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -107,7 +107,7 @@ namespace VMAP } // load one tile (internal use only) - bool VMapManager2::_loadMap(unsigned int mapId, const std::string& basePath, uint32 tileX, uint32 tileY) + bool VMapManager2::_loadMap(uint32 mapId, const std::string& basePath, uint32 tileX, uint32 tileY) { InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(mapId); if (instanceTree == iInstanceMapTrees.end()) -- cgit v1.2.3