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

1 files changed, 1 insertions, 4 deletions

diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp
index 207b652a4d6..8458ffdd5d3 100644
--- a/src/server/collision/Maps/TileAssembler.cpp
+++ b/src/server/collision/Maps/TileAssembler.cpp
@@ -54,11 +54,8 @@ namespace VMAP
     //=================================================================
 
     TileAssembler::TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName)
+        : iSrcDir(pSrcDirName), iDestDir(pDestDirName), iCurrentUniqueNameId(0), iFilterMethod(NULL)
     {
-        iCurrentUniqueNameId = 0;
-        iFilterMethod = NULL;
-        iSrcDir = pSrcDirName;
-        iDestDir = pDestDirName;
         //mkdir(iDestDir);
         //init();
     }