Merge branch 'master' into 4.x

Conflicts:
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/AI/CoreAI/CombatAI.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
	src/tools/vmap3_extractor/model.h
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/dbcfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h

2 files changed, 73 insertions, 0 deletions

diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
new file mode 100644
index 00000000000..e4f57646c49
--- /dev/null
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+include_directories(
+  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
+  ${CMAKE_SOURCE_DIR}/src/server/collision
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Models
+  ${ACE_INCLUDE_DIR}
+  ${ZLIB_INCLUDE_DIR}
+)
+
+add_definitions(-DNO_CORE_FUNCS)
+add_executable(vmap4assembler VMapAssembler.cpp)
+add_dependencies(vmap4assembler mpq)
+
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  set_target_properties(vmap4assembler PROPERTIES LINK_FLAGS "-framework Carbon")
+endif()
+
+target_link_libraries(vmap4assembler
+  collision
+  g3dlib
+  ${ZLIB_LIBRARIES}
+)
+
+if( UNIX )
+  install(TARGETS vmap4assembler DESTINATION bin)
+elseif( WIN32 )
+  install(TARGETS vmap4assembler DESTINATION "${CMAKE_INSTALL_PREFIX}")
+endif()
diff --git a/src/tools/vmap4_assembler/VMapAssembler.cpp b/src/tools/vmap4_assembler/VMapAssembler.cpp
new file mode 100644
index 00000000000..bb8e324bc75
--- /dev/null
+++ b/src/tools/vmap4_assembler/VMapAssembler.cpp
@@ -0,0 +1,32 @@
+#include <string>
+#include <iostream>
+
+#include "TileAssembler.h"
+
+int main(int argc, char* argv[])
+{
+    if(argc != 3)
+    {
+        //printf("\nusage: %s <raw data dir> <vmap dest dir> [config file name]\n", argv[0]);
+        std::cout << "usage: " << argv[0] << " <raw data dir> <vmap dest dir>" << std::endl;
+        return 1;
+    }
+
+    std::string src = argv[1];
+    std::string dest = argv[2];
+
+    std::cout << "using " << src << " as source directory and writing output to " << dest << std::endl;
+
+    VMAP::TileAssembler* ta = new VMAP::TileAssembler(src, dest);
+
+    if(!ta->convertWorld2())
+    {
+        std::cout << "exit with errors" << std::endl;
+        delete ta;
+        return 1;
+    }
+
+    delete ta;
+    std::cout << "Ok, all done" << std::endl;
+    return 0;
+}