diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-07-25 15:37:35 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-25 16:22:33 +0100 |
| commit | 130878c1a5d3f1ae42564a14fb6f0a19840f8749 (patch) | |
| tree | 73c09ca6da74f3763b2813df5e2f95fd4e91081e /src/server/collision/Management/VMapManager2.cpp | |
| parent | c40d3be6dc3cc54fce8296e1a6294a3d51eff4da (diff) | |
Core/Collision: Removed direct GameObject references from collision project
(cherry picked from commit a029f97c8231f7be188663d63f95f34dd1b4f9e1)
Conflicts:
src/server/collision/Models/GameObjectModel.cpp
Diffstat (limited to 'src/server/collision/Management/VMapManager2.cpp')
| -rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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()) |