Merge branch 'master' of github.com:TrinityCore/TrinityCore

Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Server/Protocol/Opcodes.cpp

1 files changed, 9 insertions, 12 deletions

diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index 926ff2c8051..6ce641f81bd 100755
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -35,14 +35,18 @@ class MapManager
     friend class ACE_Singleton<MapManager, ACE_Thread_Mutex>;
 
     public:
-
-        Map* CreateMap(uint32, const WorldObject* obj, uint32 instanceId);
-        Map const* CreateBaseMap(uint32 id) const { return const_cast<MapManager*>(this)->_createBaseMap(id); }
-        Map* FindMap(uint32 mapid, uint32 instanceId = 0) const;
+        Map* CreateBaseMap(uint32 mapId);
+        Map* FindBaseMap(uint32 mapId) const
+        {
+            MapMapType::const_iterator iter = i_maps.find(mapId);
+            return (iter == i_maps.end() ? NULL : iter->second);
+        }
+        Map* CreateMap(uint32 mapId, Player* player);
+        Map* FindMap(uint32 mapId, uint32 instanceId) const;
 
         uint16 GetAreaFlag(uint32 mapid, float x, float y, float z) const
         {
-            Map const* m = CreateBaseMap(mapid);
+            Map const* m = const_cast<MapManager*>(this)->CreateBaseMap(mapid);
             return m->GetAreaFlag(x, y, z);
         }
         uint32 GetAreaId(uint32 mapid, float x, float y, float z) const
@@ -163,13 +167,6 @@ class MapManager
         MapManager(const MapManager &);
         MapManager& operator=(const MapManager &);
 
-        Map* _createBaseMap(uint32 id);
-        Map* _findMap(uint32 id) const
-        {
-            MapMapType::const_iterator iter = i_maps.find(id);
-            return (iter == i_maps.end() ? NULL : iter->second);
-        }
-
         ACE_Thread_Mutex Lock;
         uint32 i_gridCleanUpDelay;
         MapMapType i_maps;