diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-30 23:06:19 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-30 23:06:19 +0100 |
| commit | d61f3131fb3b149c5c075dee5507cbed29927a80 (patch) | |
| tree | 9ef1d57bbcdcf9ab8f255f7349036f3ef5fb50ff /src/server/collision/Maps/MapTree.cpp | |
| parent | 872c239dbe0a0a289ed72b3204986df2a612f546 (diff) | |
| parent | e3d9768a50a3b2b700d65e0cc96e697a5c9d22dc (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
src/server/scripts/Kalimdor/silithus.cpp
src/server/shared/DataStores/DBCFileLoader.h
src/server/shared/Database/Implementation/WorldDatabase.cpp
src/tools/map_extractor/System.cpp
src/tools/map_extractor/dbcfile.cpp
src/tools/vmap4_extractor/adtfile.cpp
src/tools/vmap4_extractor/dbcfile.cpp
src/tools/vmap4_extractor/wdtfile.cpp
Diffstat (limited to 'src/server/collision/Maps/MapTree.cpp')
| -rw-r--r-- | src/server/collision/Maps/MapTree.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp index 6489ddd7a4f..f35e36d92fd 100644 --- a/src/server/collision/Maps/MapTree.cpp +++ b/src/server/collision/Maps/MapTree.cpp @@ -124,8 +124,8 @@ namespace VMAP return intersectionCallBack.result; } - StaticMapTree::StaticMapTree(uint32 mapID, const std::string &basePath): - iMapID(mapID), iTreeValues(0), iBasePath(basePath) + StaticMapTree::StaticMapTree(uint32 mapID, const std::string &basePath) + : iMapID(mapID), iTreeValues(0), iBasePath(basePath), iIsTiled(false) { if (iBasePath.length() > 0 && iBasePath[iBasePath.length()-1] != '/' && iBasePath[iBasePath.length()-1] != '\\') { |